Commit graph

1276 commits

Author SHA1 Message Date
Robin van der Linde
c4512748d0
Merge branch 'develop' into feature/maproulette 2022-07-19 20:54:44 +02:00
e9f8cc67e6 Merge branch 'develop' 2022-07-19 13:30:30 +02:00
Andrews Leruth
dd90456638 fixed typo 2022-07-19 12:28:38 +02:00
Andrews Leruth
fc7d287c37 added elevator to onwheels theme 2022-07-19 12:26:53 +02:00
1f230720ba Merge branch 'develop' 2022-07-19 12:08:15 +02:00
Robin van der Linde
983ada79f3
Changed tagrendering 2022-07-19 12:06:26 +02:00
9319f93bf2
Merge pull request #965 from pietervdvn/feature/entrance-kerb-info
Feature/entrance kerb info
2022-07-19 12:02:37 +02:00
034e3cf282 Add reception desk layers 2022-07-19 11:55:46 +02:00
Andrews Leruth
f4f845ae8f fixed typo 2022-07-19 11:53:16 +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
b7dfdcab70 Increase minzoom on onwheels 2022-07-18 17:17:21 +02:00
65ee3a22c4 Hide walls_and_buildings from layout overview 2022-07-18 16:29:43 +02: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
c8de5166f1 Attempt to fix the build 2022-07-18 15:15:48 +02:00
b5750c8c1a Remove unneeded icon 2022-07-18 14:59:01 +02:00
88d9f70c6d Translation sync 2022-07-18 13:56: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
f460895f60 Merge develop 2022-07-18 10:44:42 +02:00
d805686fd5 Fix build 2022-07-18 10:41:20 +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
Andrews Leruth
de53d67577 reset unnecessary files 2022-07-18 10:19:28 +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
f6ea4c18fa Download new stats 2022-07-16 01:01:51 +02:00
07973e37a6 Add priority-search to the searchable element 2022-07-15 01:10:10 +02:00
Robin van der Linde
f7506e07cd
Add hotel layer, conversion scripts 2022-07-14 15:17:09 +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
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
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
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
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
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
a7f2c26a1d Concept for rendering maproulette tasks 2022-07-09 21:41:33 +00:00
1055e3c47b Merge master 2022-07-09 17:33:53 +02:00
4ef5d31c53 Housekeeping... 2022-07-09 17:25:38 +02:00
d8d0fa685b Merge all healtcare layers into a map theme 2022-07-07 23:27:36 +02:00
fe522022b2 Clean cycle infra logo 2022-07-07 22:32:36 +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
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
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
0e0beb3efd
Merge develop into kerbs-crossings 2022-07-02 11:52:52 +02:00
ff4be56c42 More reuse of icons 2022-07-02 02:45:59 +02:00
Robin van der Linde
ab4d60b0d8
Merge branch 'develop' into kerbs-crossings 2022-07-01 16:05:49 +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
3436894249
Merge branch 'develop' into kerbs-crossings 2022-06-29 20:04:05 +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
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
52543893f6 Fix build, merge translations 2022-06-24 19:00:02 +02:00
09b230b5be Housekeeping... 2022-06-24 03:52:54 +02:00
1305e0c2db Make sure that landing pages are in english 2022-06-24 03:37:00 +02:00
a839e6e820 Enable automatic conflation in the GRB theme 2022-06-24 03:37:00 +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