Commit graph

1115 commits

Author SHA1 Message Date
3bd912db5a Merge branch 'master' into develop 2022-07-28 23:27:16 +02:00
0c3dd66090 Add room name question to indoors 2022-07-28 11:16:45 +02:00
d68486ae73 Merge branch 'develop' 2022-07-28 09:42:39 +02:00
d01f6ef954 Merge translations 2022-07-28 09:30:58 +02:00
32e0c18b09 Add 'send_email'-special element, use this in bike_repair_station 2022-07-27 23:59:04 +02:00
1eb3a4422e Some small fixes to themes 2022-07-27 17:35:22 +02:00
765ea37af3 Hide revolving door specific options if the door is not revolving, fix #959 2022-07-27 17:05:29 +02:00
98d6806449 Merge branch 'develop' into feature/maproulette 2022-07-27 14:31:20 +02:00
5f70c52c0d Toilets.json: hide fee and opening hours question if the toilet is not publicly accessible; fix #971 2022-07-27 14:28:50 +02:00
Robin van der Linde
f174a3d776
Merge branch 'develop' into feature/maproulette 2022-07-27 10:25:17 +02:00
5b6ffac552 Translation sync 2022-07-27 10:16:11 +02:00
683d3782d7 Translation sync 2022-07-27 10:13:31 +02:00
Robin van der Linde
64560b9cd2
Merge branch 'develop' into feature/maproulette 2022-07-27 09:28:42 +02:00
94a533f14c Housekeeping... 2022-07-26 17:11:03 +02:00
6cf6e3c6ea Housekeeping... 2022-07-26 16:58:51 +02:00
88c6c676d6 Support for entrances too 2022-07-26 13:15:55 +02:00
80ec8f1ee1 Move level under overriden value to fix translations 2022-07-26 12:17:54 +02:00
7812933990 Merge develop 2022-07-26 12:05:02 +02:00
AlexanderRebai
536d0bddf4 fixed color for indoors mapping, minzoom for all object is better, doors, elevators, .. only show when zooming in to a building. 2022-07-26 09:16:17 +00:00
2397c73d02 Merge master 2022-07-26 10:58:26 +02:00
22d79b0dc2 Housekeeping... 2022-07-26 10:51:14 +02:00
AlexanderRebai
bd6ed338ae fixed more small things 2022-07-25 14:45:11 +00:00
24707348dc
Merge pull request #989 from pietervdvn/feature/onwheels-icons
Add hotel layer
2022-07-25 13:04:48 +02:00
Robin van der Linde
84c763ebf4
Add hotel layer 2022-07-25 10:15:50 +02:00
6149b42013
Merge pull request #988 from pietervdvn/feature/onwheels-icons
OnWheels icons
2022-07-25 09:59:47 +02:00
b9b39027d1 Add missing comma 2022-07-25 09:53:53 +02:00
118ffe9e6a Merge develop 2022-07-25 09:48:56 +02:00
Robin van der Linde
622db6efbf
Merge branch 'develop' into feature/onwheels-icons 2022-07-24 13:08:12 +02:00
Robin van der Linde
3545fbb1ee
Use more Onwheels icons 2022-07-24 13:03:34 +02:00
Robin van der Linde
1486bc3f89
Icon badge for disabled parking 2022-07-24 12:10:08 +02:00
kaipankrath
beece2a460
Add alternative drinking water tag
Add alternative tag for identifying the drinking water sources "drinking_water"="yes". The restriction on "man_made" prevents undercover reservoirs to be shown, which most probably do not allow to tap water from them.
2022-07-24 07:55:40 +02:00
f63f62922e Fix various small issues to the teams, add some more validation 2022-07-20 22:57:39 +02:00
a4b51b63ca Add question to 'does this elevator work', fix #973 2022-07-20 20:17:06 +02:00
0625d2cecb
Merge pull request #978 from pietervdvn/feature/government
Feature/government
2022-07-20 16:11:29 +02:00
fb4b4e5702 Merge branch 'feature/dashboard-layout' into develop 2022-07-20 15:23:46 +02:00
AlexanderRebai
37f6dc1213 added governments layer and theme 2022-07-20 13:10:38 +00:00
a90fa5cd63 More styling of the dashboard 2022-07-20 14:39:19 +02:00
ab1581f18c
Merge pull request #974 from pietervdvn/RobinLinde/issue-966
Added name label and opening hours icon/filter
2022-07-20 09:37:34 +02:00
616c7afab0 Add more questions to the elevator theme 2022-07-20 09:34:54 +02:00
Robin van der Linde
3ba5fb4b88
Added name label and opening hours icon/filter 2022-07-19 21:13:35 +02:00
Robin van der Linde
c4512748d0
Merge branch 'develop' into feature/maproulette 2022-07-19 20:54:44 +02:00
38497c458b
fix elevator preset 2022-07-19 15:18:07 +02:00
86e3cb758b
fix elevator tagging 2022-07-19 15:07:30 +02:00
e9f8cc67e6 Merge branch 'develop' 2022-07-19 13:30:30 +02:00
eb7d976e74 Add more questions to the elevator theme 2022-07-19 13:30:26 +02:00
Andrews Leruth
59276968cc finished elevator json 2022-07-19 12:57:14 +02:00
d31cc18059 Fix article in entrance presets 2022-07-19 12:52:31 +02:00
Andrews Leruth
fe96875f72 fixed typos and query:licenses 2022-07-19 12:26:41 +02:00
Andrews Leruth
37f42f845a Merge branch 'develop' into feature/elevator 2022-07-19 12:21:39 +02:00
Andrews Leruth
41186f9f37 added elevator layer 2022-07-19 12:20:57 +02:00
cb1e436b69 Small fixes to the entrances 2022-07-19 12:06:57 +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
30c1ed94c5 Add missing icons, actually add reception desk layer 2022-07-19 11:57:48 +02:00
Andrews Leruth
b39db04895 Merge branch 'develop' into feature/elevator 2022-07-19 11:53:37 +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
Andrews Leruth
caae66e0ae tagrenderings 2022-07-18 17:04:55 +02:00
e37ada0b20 Merge branch 'master' into develop 2022-07-18 16:20:25 +02:00
Andrews Leruth
6d5bcab199 started elevator layer 2022-07-18 15:11:06 +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
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
Andrews Leruth
4af43b4afc added entrance:id to render 2022-07-18 10:15:17 +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
b8bca0287d Refactor isShown into a tagsfilter 2022-07-18 02:00:32 +02:00
d9979940ee Improve documentation 2022-07-18 00:58:30 +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
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
65997291bb Allow closing Maproulette tasks 2022-07-13 08:03:09 +00:00