Commit graph

2204 commits

Author SHA1 Message Date
Andrews Leruth
b39db04895 Merge branch 'develop' into feature/elevator 2022-07-19 11:53:37 +02:00
Andrews Leruth
f4f845ae8f fixed typo 2022-07-19 11:53:16 +02:00
Andrews Leruth
665ece1d3e removed calulatedTags 2022-07-19 10:56:07 +02:00
Andrews Leruth
d617657fa5 Merge branch 'develop' into feature/entrance-kerb-info 2022-07-19 10:53:41 +02:00
Andrews Leruth
ce24fb5b88 entrance now has kerb-height questions 2022-07-19 10:50:29 +02:00
Andrews Leruth
2611bd2052 added calculated tags 2022-07-19 09:41:25 +02:00
Robin van der Linde
330f1f53f3
Merge branch 'develop' into feature/maproulette 2022-07-19 09:38:12 +02:00
47b50e2b94 Fix typo 2022-07-19 09:24:00 +02:00
5c0ff4e1b0
Merge branch 'develop' into feature/pharmacy 2022-07-19 09:12:12 +02:00
Andrews Leruth
39d5ca424f added kerb type and height question for entrance 2022-07-19 08:36:41 +02:00
b7dfdcab70 Increase minzoom on onwheels 2022-07-18 17:17:21 +02:00
Andrews Leruth
caae66e0ae tagrenderings 2022-07-18 17:04:55 +02:00
65ee3a22c4 Hide walls_and_buildings from layout overview 2022-07-18 16:29:43 +02:00
AlexanderRebai
98d061b24a latest 2022-07-18 14:28:12 +00:00
0ea3239933 Remove unresolved merge conflict 2022-07-18 16:23:18 +02:00
e37ada0b20 Merge branch 'master' into develop 2022-07-18 16:20:25 +02:00
Robin van der Linde
63bb1a4da3
Show buttons for adding tags and importing 2022-07-18 16:08:41 +02:00
3ae7478bfb Another attempt to fix the build 2022-07-18 15:45:26 +02:00
AlexanderRebai
804510ccf4 governments added 2022-07-18 13:42:17 +00:00
c8de5166f1 Attempt to fix the build 2022-07-18 15:15:48 +02:00
Andrews Leruth
6d5bcab199 started elevator layer 2022-07-18 15:11:06 +02:00
b5750c8c1a Remove unneeded icon 2022-07-18 14:59:01 +02:00
de2e39c4eb Add elevator icon 2022-07-18 13:59:32 +02:00
88d9f70c6d Translation sync 2022-07-18 13:56:37 +02:00
a538566851 Add artwork 2022-07-18 13:54:28 +02:00
3441e7c9f7 Add elevator icons 2022-07-18 13:50:14 +02:00
f307660ef1 Housekeeping... 2022-07-18 11:52:37 +02:00
80be3eb9ef Sync; fix build 2022-07-18 11:49:22 +02:00
0c512a0085 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-07-18 11:26:34 +02:00
008ed859bb Merge develop 2022-07-18 10:47:58 +02:00
2c51c82541 Remove 'corridor' from the indoor theme 2022-07-18 10:45:54 +02:00
f460895f60 Merge develop 2022-07-18 10:44:42 +02:00
d805686fd5 Fix build 2022-07-18 10:41:20 +02:00
8ff405497c Improve typing, regen scheme files 2022-07-18 10:26:15 +02:00
a1c4cdd544 Add fallback as title for pharmacies without a name 2022-07-18 10:26:15 +02:00
c9c67936b8
Merge pull request #961 from pietervdvn/feature/walls-and-buildings
Feature/walls and buildings
2022-07-18 10:25:59 +02:00
47a184d626 Fix #955 2022-07-18 10:23:50 +02:00
AlexanderRebai
28f1dc3d33 testing code for slider to change levels 2022-07-18 08:21:16 +00:00
Andrews Leruth
de53d67577 reset unnecessary files 2022-07-18 10:19:28 +02:00
Andrews Leruth
4af43b4afc added entrance:id to render 2022-07-18 10:15:17 +02:00
Robin van der Linde
512282772a
Generate translations 2022-07-18 10:08:39 +02:00
Andrews Leruth
f749259b76 tags don't show if we click on an entrance 2022-07-18 09:58:03 +02:00
Robin van der Linde
1ce88c18c5
Merge branch 'develop' into feature/maproulette 2022-07-18 09:41:38 +02:00
Andrews Leruth
a5d80401a3 POIs can display data from their outer walls 2022-07-18 09:31:54 +02:00
7e0bbab156 Enable the education theme 2022-07-18 09:22:18 +02:00
b8bca0287d Refactor isShown into a tagsfilter 2022-07-18 02:00:32 +02:00
169db873f0 Update documentation 2022-07-18 00:59:23 +02:00
d9979940ee Improve documentation 2022-07-18 00:58:30 +02:00
336b7b39aa Remove last 'AndOrTagRenderingConfig'-mentions, Regenerate schema files 2022-07-18 00:30:57 +02:00
a89f5a0e3e More dashboard view, add documentation in dashboard view 2022-07-16 03:57:13 +02:00
f6ea4c18fa Download new stats 2022-07-16 01:01:51 +02:00
89278f6d74 Styling tweaks to the dashboar 2022-07-15 12:56:16 +02:00
07973e37a6 Add priority-search to the searchable element 2022-07-15 01:10:10 +02:00
Robin van der Linde
5290e0042b
Add presets and titles 2022-07-14 15:45:57 +02:00
Robin van der Linde
f7506e07cd
Add hotel layer, conversion scripts 2022-07-14 15:17:09 +02:00
Robin van der Linde
64288ec1b8
Merge branch 'develop' into feature/maproulette 2022-07-14 09:19:11 +02:00
c916d5fe66 Merge develop 2022-07-13 23:12:14 +02:00
9327d96550 Fix ability to add a freeform tag when using the searchableMappings element, add test 2022-07-13 23:05:50 +02:00
Robin van der Linde
befee4b546
Add details rendering 2022-07-13 16:12:25 +02:00
Andrews Leruth
07bf3e3d34 Merge branch 'develop' into feature/walls-and-buildings 2022-07-13 14:35:38 +02:00
Andrews Leruth
c2328e784a can display calculated tags with tag renderings 2022-07-13 14:33:53 +02:00
dff8f51a6a Fix icons, rename same-as 2022-07-13 13:13:08 +02:00
71e3560b27 Fix â‚#951, fix #952 2022-07-13 13:00:47 +02:00
ce4665a4f1 Housekeeping... 2022-07-13 12:51:14 +02:00
Robin van der Linde
8d8f2f6827
Move icon 2022-07-13 11:33:11 +02:00
Robin van der Linde
e2dd4a4325
Use title icon 2022-07-13 11:32:59 +02:00
Robin van der Linde
ab7b6d9d46
Generate translations 2022-07-13 11:06:43 +02:00
Robin van der Linde
228df2aa9d
Merge branch 'develop' into parking 2022-07-13 11:02:30 +02:00
Robin van der Linde
8e27a5f38e
Merge branch 'parking' of https://github.com/pietervdvn/MapComplete into parking 2022-07-13 11:01:18 +02:00
Robin van der Linde
1c5e9426aa
Remove useless mapping 2022-07-13 11:01:08 +02:00
Robin van der Linde
3f2d50b2e1 Split out stuff 2022-07-13 08:59:02 +00:00
AlexanderRebai
f5f4d7bdcb indoors layers added, labels added 2022-07-13 08:53:55 +00:00
Robin van der Linde
556ed6001f Merge branch 'develop' into feature/maproulette 2022-07-13 08:03:32 +00:00
Robin van der Linde
65997291bb Allow closing Maproulette tasks 2022-07-13 08:03:09 +00:00
Andrews Leruth
99fabe6e5c can find entrance id 2022-07-12 15:38:39 +02:00
AlexanderRebai
c33ca35029 added an indoors layer + theme 2022-07-12 13:02:49 +00:00
a7b0db2416 Fix build, formatting 2022-07-12 14:20:40 +02:00
Andrews Leruth
99530fb27d changed shownByDefault to true 2022-07-12 13:56:57 +02:00
Andrews Leruth
c13d86a8ac fixes 2022-07-12 11:25:19 +02:00
Robin van der Linde
a1bffc7b7f Merge branch 'develop' into feature/maproulette 2022-07-12 09:01:18 +00:00
fbe11d4a90 Fix reset:layeroverview, improve rainbow map 2022-07-12 10:45:08 +02:00
Andrews Leruth
173cbf187b Merge branch 'develop' into feature/walls-and-buildings 2022-07-12 10:39:42 +02:00
Andrews Leruth
7157512004 Merge branch 'develop' into feature/walls-and-buildings 2022-07-12 10:33:27 +02:00
755d34c160 s/minZoom/minzoom/g 2022-07-12 10:30:43 +02:00
Andrews Leruth
8199419ec8 added walls and buildings theme 2022-07-12 10:25:31 +02:00
441d8467fe Fix rainbox theme and add improvements 2022-07-12 10:23:45 +02:00
Robin van der Linde
41e01c49f8 Merge branch 'develop' into feature/maproulette 2022-07-12 07:43:11 +00:00
bxl-forever
3a682970bf New feature request: rainbow-crossings 2022-07-11 20:48:19 +02:00
AlexanderRebai
3058781ac6 Merge branch 'feature/OnWheels' of https://github.com/pietervdvn/MapComplete into feature/OnWheels 2022-07-11 14:06:53 +00:00
AlexanderRebai
bfdc1056a0 fixed language english and crest background 2022-07-11 14:06:37 +00:00
7d8e43a505 Merge develop 2022-07-11 15:11:07 +02:00
AlexanderRebai
3cf5bd8dc6 Created a first version for onWheels layer 2022-07-11 11:45:09 +00:00
1a12bced60 Add generated file 2022-07-11 11:58:58 +02:00
AlexanderRebai
7fd6a89c27 Merge branch 'feature/doctor' of https://github.com/pietervdvn/MapComplete into feature/doctor 2022-07-11 09:43:07 +00:00
AlexanderRebai
a0096f9bd6 able to add name of the doctors office 2022-07-11 09:34:46 +00:00
Robin van der Linde
e01ad24bd2 Update size 2022-07-11 07:36:41 +00:00
325e30666b Wikidata language picker 2022-07-11 09:14:26 +02:00
Robin van der Linde
b4e2c69568 Generate translations, format 2022-07-10 19:47:17 +00:00
Robin van der Linde
764f9956a9 Merge branch 'develop' into feature/maproulette 2022-07-10 19:43:48 +00:00
Robin van der Linde
a6583f9934 Added description, add extra filters 2022-07-10 19:43:35 +00:00
Robin van der Linde
4b1a6fe32d Split off layer, add logo and filters 2022-07-10 19:29:37 +00:00
Robin van der Linde
cba68ec81c Fix typo 2022-07-10 19:27:47 +00:00
b75581405e Housekeeping... 2022-07-10 18:37:23 +02:00
7fdfeb865c Merge branch 'develop' into feature/flexible-mapping-search 2022-07-10 18:25:28 +02:00
f9ce1e4db4 More work on searchable mappings 2022-07-10 03:58:07 +02:00
Robin van der Linde
a7f2c26a1d Concept for rendering maproulette tasks 2022-07-09 21:41:33 +00:00
92f9a25fb0 Fix #933 2022-07-09 18:04:35 +02:00
1055e3c47b Merge master 2022-07-09 17:33:53 +02:00
4ef5d31c53 Housekeeping... 2022-07-09 17:25:38 +02:00
bb23bc0761 Add paper formats to copy shops 2022-07-08 15:37:31 +02:00
4246221e8e Fix import flow, add typing 2022-07-08 03:14:55 +02:00
97334fc369 Small tweaks to the pharmacy layer 2022-07-07 23:38:48 +02:00
d8d0fa685b Merge all healtcare layers into a map theme 2022-07-07 23:27:36 +02:00
9292ec1807 Merge branch 'feature/pharmacy' into develop 2022-07-07 22:39:54 +02:00
b5655b5533 Add hospital layer; Co-authored-by: Hasan Rezaoul <roconmachine> 2022-07-07 22:39:18 +02:00
fe522022b2 Clean cycle infra logo 2022-07-07 22:32:36 +02:00
63d0cdec56 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-07-07 16:19:26 +02:00
Andrews Leruth
438bedbfa1 added filters 2022-07-07 16:08:54 +02:00
Andrews Leruth
288c36abdc fixed typo 2022-07-07 15:56:40 +02:00
6e79ff70e0
Merge pull request #934 from pietervdvn/feature/doctor
Feature/doctor
2022-07-07 09:44:13 +02:00
503da846db Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-07-07 09:36:09 +02:00
ccb51e2175
Merge branch 'develop' into feature/doctor 2022-07-07 09:31:01 +02:00
AlexanderRebai
e8822454b8 added dentists, physiotherapists, presets and a filter isOpen 2022-07-07 07:24:37 +00:00
311da2a9b3 Fix faulty translation on delete-mappings 2022-07-06 17:25:29 +02:00
377e7838ec Add equestrian icon, fix #920 2022-07-06 16:07:24 +02:00
Andrews Leruth
7100685949 added pharmacy theme and layer 2022-07-06 15:54:21 +02:00
fb311b9d56
Merge pull request #923 from pietervdvn/transit
Transit
2022-07-06 12:29:07 +02:00
AlexanderRebai
06a02320ee improved doctors layer 2022-07-06 09:57:05 +00:00
Robin van der Linde
c8179a3a62 Small fixes 2022-07-06 09:46:52 +00:00
Robin van der Linde
b477fdfee1 Fix double braces 2022-07-06 09:33:27 +00:00
Robin van der Linde
0a330643fb Merge branch 'develop' into transit 2022-07-06 09:16:45 +00:00
AlexanderRebai
2bb48439b5 doctors feature 2022-07-05 15:04:14 +00:00
263c760a1c Housekeeping... 2022-07-05 13:52:34 +00:00
Robin van der Linde
05e3869672
Parking details, generate translations 2022-07-05 15:22:11 +02:00
64605b3255 Add delete option for restaurants and cafés 2022-07-05 13:49:00 +02:00
320570422a Move stolen presets into a separate layer to use as library 2022-07-03 13:18:34 +02:00
bb10f60636 Remove duplicate presets in Toerisme_Vlaanderen theme 2022-07-03 13:16:49 +02:00
6f51a4b3bd Housekeeping... 2022-07-02 23:24:48 +02:00
70667de472
Merge pull request #913 from loviuz/develop
Added italian translations for waste
2022-07-02 23:10:11 +02:00
loviuz
378c62137e Added italian translations for waste 2022-07-02 12:54:01 +02:00
Robin van der Linde
ce96db7e40
Add highway=living_street 2022-07-02 11:53:22 +02:00
Robin van der Linde
0e0beb3efd
Merge develop into kerbs-crossings 2022-07-02 11:52:52 +02:00
a85cedaeec Add icons 2022-07-02 02:46:56 +02:00
ff4be56c42 More reuse of icons 2022-07-02 02:45:59 +02:00
ef66b1931f Add small script to steal shop presets from the iD-project 2022-07-02 01:59:26 +02:00
Robin van der Linde
06a7a8d57f
Added kerb height 2022-07-01 16:22:46 +02:00
Robin van der Linde
ab4d60b0d8
Merge branch 'develop' into kerbs-crossings 2022-07-01 16:05:49 +02:00
2780dc8b0b Housekeeping... 2022-07-01 02:25:42 +02:00
c25745b133 Merge master 2022-07-01 00:35:48 +02:00
5ef95f12c9 Housekeeping... 2022-07-01 00:34:46 +02:00
Robin van der Linde
2b6598b1cb
Added filters to kerb layer 2022-06-30 13:06:48 +02:00
Robin van der Linde
8eab5bfdd2
Added icons to mappings 2022-06-29 22:37:06 +02:00
Robin van der Linde
3436894249
Merge branch 'develop' into kerbs-crossings 2022-06-29 20:04:05 +02:00
840fb20939 Make child care deletable 2022-06-29 03:05:40 +02:00
e67c3ffa52 Add error if hideInAnswer:true and addExtraTags are used in the same mapping, fix #906 2022-06-28 01:38:57 +02:00
3a3e2750f2 Allow different renderings in question mode, but emit a warning for this intead 2022-06-28 01:04:45 +02:00
RobJN
07ee80a675 Update uk_addresses.json 2022-06-27 23:57:36 +02:00
be38294a7f Merge master 2022-06-27 23:49:35 +02:00
dba6f22e11 Housekeeping... 2022-06-27 09:29:23 +02:00
aae96c5e7d Translation sync 2022-06-27 09:16:53 +02:00
2ccc977b52 Translation sync 2022-06-27 09:12:17 +02:00
af1e1a4fc7 Fix some translations, fix schoolyard in playground theme 2022-06-27 09:05:16 +02:00
f6e164e796
Make question translatable 2022-06-25 13:47:00 +02:00
52543893f6 Fix build, merge translations 2022-06-24 19:00:02 +02:00
f4b1af1879 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-06-24 18:13:36 +02:00
d670eec72a Housekeeping... 2022-06-24 16:59:04 +02:00
5aaf57137c Download official languages per country 2022-06-24 16:49:03 +02:00
OliNau
47338e51a8
Update school.json
Changed title() to name for language. Looks nicer to not duplicate "school"
2022-06-24 04:27:45 +02:00
OliNau
37da728aeb
Update school.json 2022-06-24 04:09:27 +02:00
09b230b5be Housekeeping... 2022-06-24 03:52:54 +02:00
2700979923 Fix icon size 2022-06-24 03:37:00 +02:00
1305e0c2db Make sure that landing pages are in english 2022-06-24 03:37:00 +02:00
b8e5800df3 Split wikidata helper into languages, fixes #893 2022-06-24 03:37:00 +02:00
a839e6e820 Enable automatic conflation in the GRB theme 2022-06-24 03:37:00 +02:00
Thibault Molleman
907fdbfe9d 'middelbare' typo fix 2022-06-23 08:16:57 +02:00
ae5f043b3d Split wikidata helper into languages, fixes #893 2022-06-23 03:06:51 +02:00
bb59e89854 Enable automatic conflation in the GRB theme 2022-06-22 20:28:59 +02:00
174a0e1852 Fix build, remove no longer used 'favourite layers 2022-06-22 20:18:17 +02:00
98c6113cbe Merge master 2022-06-22 20:06:41 +02:00
8066afd2e5 Housekeeping... 2022-06-22 18:56:02 +02:00
7f9e5d3cd6 Small fixes to education theme, temporarily hide from overview 2022-06-22 18:54:38 +02:00
b05caa8fbd Housekeeping... 2022-06-22 15:30:45 +02:00
83bf3af9ac Improve school:for; disable it until voting has passed 2022-06-22 15:22:58 +02:00
1619237398 Improvements to the school theme 2022-06-21 16:45:35 +02:00
9c5a2ad877 Fix language question 2022-06-21 13:59:31 +02:00
fa07cd5a87 Change order 2022-06-21 13:59:31 +02:00
474550cb8e Add preset for university 2022-06-21 13:59:31 +02:00
88eabd183e Further work on the educational theme 2022-06-21 13:59:31 +02:00
2408b4b19d Add universities and colleges, reorganize 2022-06-21 13:59:31 +02:00
1f0fbd23e0 Add post-secondary as level for school; add school:gender 2022-06-21 13:59:31 +02:00
378eb123f8 Add diary entry to organize thoughts 2022-06-21 13:59:31 +02:00
0229e430d1 Tweak icons 2022-06-21 13:59:31 +02:00
f7cacc15d3 Add first version of schools 2022-06-21 13:59:31 +02:00
f0c90b4d1c Merge master 2022-06-20 03:22:27 +02:00
193834c286 Fix tests 2022-06-20 03:14:44 +02:00
ca91241c3b Fix some tests 2022-06-20 01:55:29 +02:00
bae64ab2f3 Housekeeping... 2022-06-20 01:44:56 +02:00
e13c7ae677 Move some assets to the 'tagRenderings'-directory as they are only needed there, add 'smoking' question, add 'nightclubs' to 'pub_cafe'-layer 2022-06-20 01:42:30 +02:00
6d1e4836bc Merge master 2022-06-19 22:19:25 +02:00
43a214a5d1 Housekeeping... 2022-06-19 22:13:38 +02:00