Commit graph

1738 commits

Author SHA1 Message Date
6ff2c629f0 Merge branch 'master' into feature/studio 2023-07-28 14:38:12 +02:00
56ea1163bb Themes: add extra check so that in a mapping cannot override the , fix two such instances 2023-07-28 14:11:00 +02:00
ea4ccee584 Chore: translation sync 2023-07-28 13:32:07 +02:00
adcd130259 Chore: housekeeping 2023-07-28 01:12:42 +02:00
80168f5d0d Merge master 2023-07-28 00:29:21 +02:00
9d23f80539
Merge pull request #1522 from pietervdvn/RobinLinde-patch-12
Changes to waste and kerbs/crossings theme
2023-07-27 15:19:12 +02:00
701d0a509e
Merge pull request #1521 from pietervdvn/feature/reuse-compliance
Feature/reuse compliance
2023-07-27 15:10:53 +02:00
6c4b464f14 Fix: SPDX-compliance 2023-07-27 14:34:05 +02:00
Robin van der Linde
840679961f
Allow adding crossing in kerbs and crossings theme 2023-07-27 14:33:34 +02:00
Robin van der Linde
4245c16d41
Change zoom values, add survey question 2023-07-27 14:33:28 +02:00
de4ad490a4 Add licenses on the last files 2023-07-27 14:10:15 +02:00
c7d4007f93 Add licenses on the last files 2023-07-27 14:10:08 +02:00
257e6dd2b5 Docs: more work on the licenses 2023-07-27 13:04:27 +02:00
b7d3fac275 Chore: fix and merge translations 2023-07-27 12:56:26 +02:00
0d598ad094 More steps toward REUSE-compliance 2023-07-27 03:32:49 +02:00
d3aa5562a5 Unify some license expressions 2023-07-27 02:51:59 +02:00
89027ed516 Chore: fix and merge translations 2023-07-27 02:03:56 +02:00
4a26563356 Docs: Improve docs, fix doc script 2023-07-27 01:52:38 +02:00
124cfad8f8 Docs: Improve docs, fix doc script 2023-07-20 13:28:38 +02:00
3c5bde1ae3 Fix: await 'country' to be loaded 2023-07-18 01:53:37 +02:00
e3a73d551a
Merge pull request #1511 from pietervdvn/RobinLinde-patch-11
Currency metatagger, fix docs scripts
2023-07-18 01:36:43 +02:00
90869a1c98 Fix: etymology theme now supports multi-apply again, uses lower zoom level for multiselect 2023-07-18 01:26:36 +02:00
Robin van der Linde
1858cdac95
Create currency metatagger 2023-07-17 20:25:19 +02:00
0d05256b64 Merge branch 'master' into develop 2023-07-17 01:32:30 +02:00
727a4afcc8 Chore: translation sync 2023-07-17 01:32:23 +02:00
9e10bf421f Themes: improve benches 2023-07-16 19:37:01 +02:00
7b6b375ff9 Merge branch 'master' into develop 2023-07-15 19:29:10 +02:00
996d9e43be chore: automated housekeeping... 2023-07-15 19:00:23 +02:00
54a9edc687 Themes: add benches on playground theme 2023-07-15 17:21:52 +02:00
e2a56f5e5c Fix: use proper circle for bench and artwork 2023-07-15 17:21:51 +02:00
fe0ca2ab6f
Merge pull request #1502 from pietervdvn/feature/penny-press
Penny press theme
2023-07-10 00:45:27 +02:00
Robin van der Linde
9240faef16
Merge branch 'develop' into feature/penny-press 2023-07-09 18:57:06 +02:00
Robin van der Linde
ac64e97ede
Merge branch 'develop' into feature/vending-machine 2023-07-09 18:25:33 +02:00
ab1220cbc4 Merge branch 'master' into develop 2023-07-08 01:27:06 +02:00
Robin van der Linde
c5d5f27617
Pressed Penny theme 2023-07-01 01:09:46 +02:00
c4ff70ce65 Fix: metatagging of width theme 2023-06-30 16:59:42 +02:00
3df5727f40 Themes: add shoe repair services to the climbing map, add question if a shoemaker also repairs climbing shoes, add craft=shoemaker to shops theme 2023-06-30 02:32:57 +02:00
Robin van der Linde
a23fa758fa
Merge branch 'develop' into feature/vending-machine 2023-06-29 16:31:53 +02:00
Robin van der Linde
3bdf519205
Small vending machine theme 2023-06-29 16:30:43 +02:00
24e7bc95cb Merge develop 2023-06-29 15:08:13 +02:00
006f69561a Fix: fix back-button on the 404-page, remove some obsolete classes 2023-06-29 01:10:55 +02:00
15630adb0c Merge branch 'master' into develop 2023-06-28 22:45:03 +02:00
9e911ef92a Chore: fix and regenerate docs 2023-06-28 22:43:06 +02:00
4e57944b20 Chore: translation sync 2023-06-28 22:30:08 +02:00
Robin van der Linde
337f91ef40
Merge branch 'develop' into feature/shower 2023-06-27 20:45:33 +02:00
adb5d892fb Fix: temporarily only warn for incomplete translations 2023-06-26 11:00:19 +02:00
6f3c1e1bc3 Chore: sync translation and themes 2023-06-23 22:59:56 +02:00
0876cc02fc Merge master 2023-06-23 21:50:44 +02:00
ee6c63ee14 chore: automated housekeeping... 2023-06-23 21:15:11 +02:00
58182d10f0 Chore: regenerate translations with older commit 2023-06-23 17:43:34 +02:00
5a49677d5a Chore: formatting 2023-06-22 17:25:41 +02:00
1a7acc80c1 Themes: add statistics on used version 2023-06-20 22:50:16 +02:00
Robin van der Linde
932712e8d9
Basic shower layer 2023-06-20 19:51:19 +02:00
4a6457f146 Refactoring: More fixes to the themes 2023-06-20 03:49:16 +02:00
c260d16159 Refactoring: move more anchor specifications out of iconsize 2023-06-20 03:49:16 +02:00
e86f7d863e Refactoring: further cleanup of the themes 2023-06-20 03:49:16 +02:00
f4b7e7eb88 Refactoring: cleanup of last incorrect iconSize fields 2023-06-20 02:48:42 +02:00
140c813151 Refactoring: move anchor out of iconSize 2023-06-20 02:48:42 +02:00
a6f7b1300a Refactoring: move 'snapToLayer' from 'preciseInput' into the preset, remove 'preferredBackground'. The addNewPointFlow _always_ shows the precise input flow with the basic map; so the preferredBackground became irrelevant 2023-06-20 01:52:15 +02:00
92b3ee4bae
Update atm.json: increase merge range 2023-06-16 23:55:02 +02:00
9e15353588 Themes: disable 'direction'-indicator for surveillance theme as it breaks selection, fix #1458 2023-06-14 20:45:25 +02:00
0d1a91dbab Merge develop 2023-06-11 23:12:10 +02:00
5b291777be Fix: fix rainbow crossings theme 2023-06-11 22:52:22 +02:00
bxl-forever
7dd3b4be4d Updated rainbow crossing theme to use surface:colour on footways instead of crossing:marking (deprecated) 2023-06-11 14:43:15 +02:00
9cffe6814e Merge: develop 2023-06-11 02:32:14 +02:00
c47876e6f0 chore: automated housekeeping... 2023-06-11 02:02:23 +02:00
5f7cc351c9 Fix: maproulette import flow 2023-06-09 16:13:35 +02:00
f80054558f Themes: fix calculated tags of climbing theme 2023-06-08 19:54:34 +02:00
905f796baa Fix: png correctly outputs all markers now 2023-06-04 00:43:32 +02:00
ab70c6adc0 Merge develop 2023-06-01 23:56:29 +02:00
08dc643f6a Chore: translation sync 2023-06-01 23:50:58 +02:00
63989686d3 Chore: translation sync 2023-06-01 23:47:45 +02:00
fbf2742f80 Tweaking GRB theme a bit more 2023-06-01 03:17:52 +02:00
ace7caada1 Refactoring: port import flow 2023-06-01 02:52:21 +02:00
1c99173f32 Fix: layers now compile again 2023-05-30 03:22:21 +02:00
52b54d8b08 Chore: sync translations 2023-05-30 01:32:11 +02:00
b86e2910ba Fix: improve functionality of GRB-theme (WIP) 2023-05-24 03:26:33 +02:00
8fd3fbc0b7 Refactoring: fix metatagging 2023-05-16 03:27:49 +02:00
96544ec785 Chore: Reset mapcomplete-changes theme 2023-05-09 00:30:09 +02:00
6366d82e6c Refactoring: remove unnused 'natuurpunt'-theme, remove custom surveillance theme 2023-05-08 22:53:10 +02:00
e6163ed2eb Merge develop 2023-05-08 00:20:32 +02:00
867cb4dcfb chore: automated housekeeping... 2023-05-07 23:50:39 +02:00
6a82fb4ad1 Merge branch 'master' into develop 2023-05-07 23:47:54 +02:00
Robin van der Linde
0e898967a5
Add fixme layer (#1390) 2023-05-06 12:19:35 +02:00
Robin van der Linde
1a41d17ece
Add water and clock to stations 2023-05-06 11:39:24 +02:00
f7eaec2243 Refactoring: remove import flow, fix various issues, get PDF-export working (but not quite) 2023-05-05 02:03:41 +02:00
4a9b7e0349 Chore: translation sync 2023-05-02 00:49:00 +02:00
0542163e27 Translation sync + typo fix 2023-05-01 10:10:47 +02:00
2b47cf934c Refactoring: highlight the currently selected element 2023-04-27 02:24:38 +02:00
d8e14927c8 Refactoring: port wikipedia panel to Svelte 2023-04-21 16:02:36 +02:00
24f7610d0a Fix overlay layers 2023-04-21 01:53:24 +02:00
4172af6a72 Refactoring: fix delete indication, fix splitroad, fix addition of multiple new points snapped onto the same way (all will properly attach now) 2023-04-20 17:42:07 +02:00
8eb2c68f79 Refactoring: fix rendering of new roads, generated by a split 2023-04-20 01:52:23 +02:00
7163d68751 Merge develop 2023-04-19 13:08:58 +02:00
771783a31c Merge develop 2023-04-14 17:57:46 +02:00
8a1f0599d9 Refactoring: fix 'delete' and 'move'-buttons as special elements 2023-04-14 02:42:57 +02:00
bef05481bd Merge develop 2023-04-07 04:36:41 +02:00
40dbc82cff chore: automated housekeeping... 2023-04-03 00:33:50 +02:00
64532d1faf Tweaks to question box 2023-03-31 04:04:11 +02:00
d47fd7e746 Add question box as special rendering 2023-03-31 03:28:11 +02:00
41e6a2c760 More refactoring 2023-03-29 17:21:20 +02:00
e61c2bb48f chore: move 'advertising' layer into separate layer object, fix #1365 2023-03-29 16:19:10 +02:00
48a26a2eaf chore: automated housekeeping... 2023-03-29 15:50:10 +02:00
be73076979 chore: automated housekeeping... 2023-03-27 15:09:15 +02:00
b94a8f5745 refactoring: more state splitting, basic layoutFeatureSource 2023-03-26 05:58:28 +02:00
8e2f04c0d0 refactoring: split all the states 2023-03-25 02:48:24 +01:00
18e1758701 chore: automated housekeeping... 2023-03-24 12:23:42 +01:00
a9031129d3 fix: typo in tag 2023-03-22 16:02:18 +01:00
7ebaaa7e32 Enable 'sides'-question for screens and billboards too 2023-03-17 16:21:14 +01:00
paunofu
c8b10718ce
Added translations for Spanish and Catalan 2023-03-16 23:31:18 +01:00
93fcbd83ee Use square icon to fix social images 2023-03-16 18:24:46 +01:00
471f792c4d Formatting, fix build 2023-03-16 16:28:24 +01:00
c61792604b
Merge pull request #1310 from pietervdvn/theme/advertising
Theme/advertising
2023-03-16 16:00:27 +01:00
3e72ba2b46 themes(advertising): last icon 2023-03-16 15:59:03 +01:00
19649d712d chore: automated housekeeping... 2023-03-16 15:09:26 +01:00
7fc0770488 themes(advertising): more icons, reordering of the questions 2023-03-16 14:23:43 +01:00
8127027251 themes(advertising): further refinements 2023-03-15 22:08:30 +01:00
59eabc5daa themes(advertising): further refinements 2023-03-15 22:03:10 +01:00
8b7c5a258d theme(advertising): Use correct tag to detect snapping layer 2023-03-15 15:25:23 +01:00
e60b3d159f Regenerate 2023-03-15 15:19:46 +01:00
971f06f337 theme(advertising): add brick wall background 2023-03-15 15:02:12 +01:00
e67d740769 Merge develop 2023-03-15 14:29:53 +01:00
paunofu
99eb397d31 Added two example image to sign 2023-03-14 11:37:25 +01:00
paunofu
3319ee42ce Improved phrasing for ca and es 2023-03-14 10:56:34 +01:00
paunofu
c23ed1f1e7 added path to screen 2023-03-14 10:51:24 +01:00
090130d596 themes(advertising): add (animated!) flag and screen icons 2023-03-14 00:31:44 +01:00
7464bf857f chore: automated housekeeping... 2023-03-13 20:14:39 +01:00
paunofu
37da1ad035 Added visibility question 2023-03-13 12:42:01 +01:00
a89e74dda2 chore: Reduce image sizes of example images 2023-03-11 03:05:18 +01:00
9e02c89fd5 themes(advertising): Fix typos 2023-03-11 03:04:20 +01:00
paunofu
e022959b3a Added exampleImages 2023-03-10 11:31:00 +01:00
4850e5094a fix(themes): remove 'unkown' mapping from hydrants, the unkown case is handled by MapComplete 2023-03-09 23:25:07 +01:00
c596e3750c chore: automated housekeeping... 2023-03-09 23:19:12 +01:00
c11bcb1817 chore: use questionhint in buurtnatuur.json; fix obsolete <br/> in hospital.json 2023-03-09 17:10:17 +01:00
54729b3c33 chore: automated housekeeping... 2023-03-08 18:16:05 +01:00
ebdc8be7d8 Fix typo 2023-03-08 03:39:03 +01:00
35d12a653d chore: use questionhints 2023-03-08 03:37:32 +01:00
56d3ddfedc chore: extract question hint for uk_addresses 2023-03-08 03:21:14 +01:00
9da0a50829 chore: translation sync 2023-03-08 03:01:51 +01:00
db25d64409 Merge branch 'master' into develop 2023-03-08 02:57:31 +01:00
fc947b68b3 Housekeeping... 2023-03-08 02:05:27 +01:00
paunofu
d1118958bc Add more ExampleImages 2023-03-06 23:54:46 +01:00
92c5e5dea2 Add some useful filters 2023-03-05 23:44:28 +01:00
paunofu
7081f3f5c8 Added example images for poster box 2023-03-04 00:23:42 +01:00
paunofu
de57c430f5 Merge branch 'theme/advertising' of https://github.com/pietervdvn/MapComplete into theme/advertising 2023-03-04 00:10:58 +01:00
paunofu
b76b509f72 Added column example images 2023-03-04 00:10:54 +01:00
paunofu
f34c229c2a
Update advertising.json 2023-03-03 02:28:45 +01:00
paunofu
a09a4dea74 re run npm 2023-03-02 13:49:44 +01:00
paunofu
12049eb3a3 upper case jpg 2023-03-02 13:21:14 +01:00
paunofu
a77467d04e run npm
run npm run query:licenses' and run npm run generate:licenses
2023-03-02 13:08:55 +01:00