Commit graph

839 commits

Author SHA1 Message Date
88cddd2367 Merge master 2021-07-18 18:44:25 +02:00
1af57e6efe Add question for private access 2021-07-18 18:31:42 +02:00
1d01238973 Fix play forests in temporary speelplekken-layer 2021-07-18 18:20:52 +02:00
bd89e66aca Translation sync, move new question to the bottom 2021-07-18 18:02:17 +02:00
9c9be0918b Merge branch 'develop' into feature/road-splitting 2021-07-18 15:17:04 +02:00
385c87ec10 Merge master 2021-07-18 15:13:09 +02:00
1caf70ca96 Add level indication to bike pumps, fixes #434 2021-07-18 15:06:36 +02:00
b55f9a25c6 More work on refactoring the changes handling 2021-07-18 14:52:09 +02:00
42391b4ff1 Merge develop 2021-07-16 02:25:39 +02:00
36ba81e26d Enable download functionality 2021-07-16 01:44:31 +02:00
93ae7441d1 Merge develop 2021-07-16 01:43:24 +02:00
18e27c32be Merge branch 'develop' into feature/goejson-export 2021-07-16 00:57:39 +02:00
0af3a91fde Fix licenses, small improvement to icon 2021-07-16 00:57:33 +02:00
294bdbfd92 Add missing license info 2021-07-16 00:49:50 +02:00
46d57edea0 Translation sync 2021-07-15 21:01:10 +02:00
96ecded0b9 Further development of split-road feature; refactoring of change-handling 2021-07-15 20:47:28 +02:00
Robin van der Linde
a4076944ac Re-arrange questions and add lit question 2021-07-15 11:51:24 +02:00
Robin van der Linde
1f0d8d13d0 Fix some conditions 2021-07-15 11:37:12 +02:00
Robin van der Linde
b704a17191 Include all cycleways 2021-07-15 11:27:20 +02:00
Robin van der Linde
e0ae7e33bd Exclude highway=path 2021-07-15 10:13:44 +02:00
Robin van der Linde
c1d94cfdee Fix highway=path and cycleway=track not showing 2021-07-15 10:06:56 +02:00
Robin van der Linde
f83090ccfd Add hidden zebra answer 2021-07-15 09:33:28 +02:00
dc4cdda3b5 Translation sync 2021-07-15 00:39:40 +02:00
1010b159e5 Merge develop 2021-07-15 00:39:11 +02:00
4cc42c0842 WIP: length picker 2021-07-14 16:06:34 +02:00
Robin van der Linde
7426271081 Updated smoothness questions 2021-07-14 14:24:45 +02:00
Robin van der Linde
213eb3fdef Add title mappings 2021-07-14 14:16:00 +02:00
Robin van der Linde
2de8e98deb Added questions about island, tactile paving and traffic light 2021-07-14 13:53:01 +02:00
Robin van der Linde
f4d5557534 Added crossing to bicycle_infra 2021-07-14 11:40:00 +02:00
196894cca7 Add designated lock icon 2021-07-14 00:25:09 +02:00
315e2f7fd1 Add precise input method, enabled for public bookcases 2021-07-14 00:17:15 +02:00
42d0071b26 Use canonical rendering in windpowermap 2021-07-13 18:52:02 +02:00
f5cc180eea Add new units to the bottom as not to break translations 2021-07-13 18:36:31 +02:00
54a084d81c Add units to height of windmills 2021-07-13 18:34:20 +02:00
Robin van der Linde
6a269a2c6e Bollard details 2021-07-13 16:52:22 +02:00
karelleketers
dd26321f9b Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt 2021-07-13 16:39:32 +02:00
karelleketers
a69d6c3a2b Added Trails + Parking Layers/Themes 2021-07-13 16:38:09 +02:00
Robin van der Linde
7a73f6416b Restructure layer, added barrier basics 2021-07-13 14:35:29 +02:00
Arno Deceuninck
ae5325d4d1 First draft of split road 2021-07-13 11:26:50 +02:00
33e2dca7e4 Add tests for tags, add check for duplicate names as layer ids, fix #393 2021-07-12 11:44:55 +02:00
Robin van der Linde
b5f9a1733d Fix random typos 2021-07-12 11:44:24 +02:00
Robin van der Linde
37d0c86e3d Some restructuring and adding smoothness 2021-07-12 11:38:51 +02:00
Ward
4276d4a47d auto generated stuff 2021-07-12 11:34:01 +02:00
karelleketers
fa9313a3b7 Adjust Nature Reserve Layer 2021-07-12 10:13:48 +02:00
6e3c39e475 Add option to show text field inline with the rendering; add option to fill out a default value 2021-07-11 15:44:17 +02:00
29ea0ac925 Merge master 2021-07-11 13:46:20 +02:00
8a83bef5a9 Add 'climbing=area' as alternative for 'climbing=site' 2021-07-11 13:45:56 +02:00
karelleketers
df5fd47f2f Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt 2021-07-11 06:00:28 +02:00
karelleketers
3a48abb263 Reduced Natuurpunt Builtin Layers 2021-07-11 05:59:55 +02:00
58ac26b0b3 Fix warnings in climbing theme 2021-07-10 21:23:32 +02:00
80cb9efaf0 Translation sync 2021-07-10 20:56:59 +02:00
fbffb367a7 Fix wikidata icon 2021-07-10 19:21:27 +02:00
6732c12a0c First version which caches changesets if not uploaded 2021-07-10 15:52:52 +02:00
Seppe Santens
a36168417e Add OpenWindPowerMap theme 2021-07-09 16:16:35 +02:00
Arno Deceuninck
91b0ed7987 Fix cyclestreet as "no cycleway" 2021-07-08 14:31:58 +02:00
Ward Beyens
d239f75ff8 updata layer vistior centre for natuurpunt 2021-07-08 12:08:03 +02:00
Ward Beyens
9a3aedacbf natuurpunt visitor centre layer 2021-07-08 12:06:17 +02:00
karelleketers
daff0f6fb8 Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt 2021-07-08 11:33:32 +02:00
karelleketers
c6afdd690e Adjusted Trails JSON 2021-07-08 11:33:25 +02:00
LiamSimons
502f70d004 merge master, fixx bugs 2021-07-08 11:31:26 +02:00
LiamSimons
91cf0a9a2e Fixed error in waste_basket but waste_basket.svg broken in layer 2021-07-08 10:45:10 +02:00
c8b70dec9d Fix theme 2021-07-07 22:29:07 +02:00
3a56dd1d9d Re-add waste basket theme 2021-07-07 22:21:01 +02:00
pgm-chardelv1
b9aa1435cc Adds conditional render of carriage width question 2021-07-07 19:59:56 +02:00
1175562c18 Merge branch 'master' into project/natuurpunt 2021-07-07 18:20:22 +02:00
18753a3548 Merge master 2021-07-07 18:19:54 +02:00
844df16524 Translation sync 2021-07-07 18:19:12 +02:00
Arno Deceuninck
ec250252d2 Merged all layers related to cycle paths 2021-07-07 17:20:17 +02:00
karelleketers
b636f00006 merged layers Natuurpunt 2021-07-07 16:30:15 +02:00
Arno Deceuninck
e23f225532 Fix cyclestreets dissapeared after merge conflict 2021-07-07 16:27:35 +02:00
karelleketers
9cb275d7c4 Added Trails Layer 2021-07-07 16:26:58 +02:00
Arno Deceuninck
3eba5f893e Merge remote-tracking branch 'origin/project/cycle-infra' into project/cycle-infra
# Conflicts:
#	assets/themes/cycle_infra/cycle_infra.json
2021-07-07 16:24:12 +02:00
Arno Deceuninck
fd3b9f5c6e Cycleway type questions 2021-07-07 16:21:08 +02:00
pgm-chardelv1
247380ca33 Generate question for carriagewidth | Needs to be moved 2021-07-07 15:54:26 +02:00
4a08dc74d8 Merge branch 'project/natuurpunt' of github.com:pietervdvn/MapComplete into project/natuurpunt 2021-07-07 15:52:57 +02:00
LiamSimons
08c47551fa waste_basket.json fixed svg directory 2021-07-07 15:15:34 +02:00
LiamSimons
a5275b386b waste_basket.json saved again 2021-07-07 15:12:10 +02:00
21788b43dc Merge branch 'project/natuurpunt' of github.com:pietervdvn/MapComplete into project/natuurpunt 2021-07-07 15:10:55 +02:00
LiamSimons
81e621d63d waste_basket theme and layer 2021-07-07 15:08:49 +02:00
b8bf3cc714 Only show nature reserves of Natuurpunt 2021-07-07 13:24:37 +02:00
Ward Beyens
cbf7ef764d extra layers natuurpunt 2021-07-07 13:11:06 +02:00
pgm-chardelv1
179e06cec6 Fixes keys for maxspeed 2021-07-07 09:51:06 +02:00
root
e749b44459 added extra layers to theme natuurpunt 2021-07-07 01:34:48 +02:00
Robin van der Linde
c79c6f85f4 Basic cyclestreet 2021-07-06 16:45:17 +02:00
Arno Deceuninck
f51f2598e5 Updated dutch translations 2021-07-06 16:24:35 +02:00
pgm-chardelv1
199dfaf904 Adds maxspeed questions to shared lanes and lanes 2021-07-06 16:17:36 +02:00
Arno Deceuninck
3da3e25980 Surface type basic questions 2021-07-06 15:57:02 +02:00
d3b748b873 Fix logo 2021-07-06 15:48:09 +02:00
karelleketers
bf0924a699 Added Natuurpunt Theme 2021-07-06 15:18:41 +02:00
Arno Deceuninck
43980a2a78 Cycleway type colors 2021-07-06 15:05:57 +02:00
8b1b843dbe Merge branch 'master' into develop 2021-07-04 00:36:22 +02:00
19d34454af Translation sync 2021-07-04 00:22:46 +02:00
28bcf1266b Translation sync 2021-07-03 21:41:17 +02:00
e4c29ce660 First version of a delete button, is working 2021-07-03 14:35:44 +02:00
b7798a470c Merge branch 'master' into develop 2021-06-28 01:22:16 +02:00
33264c61b3 Translation sync 2021-06-28 01:22:08 +02:00
58812b50f2 Small improvements to fritures theme: add vegetarian and opening hours indicators 2021-06-28 01:19:03 +02:00
0e15d483d4 Fix typo 2021-06-28 00:50:45 +02:00
284102c2f1 Seperate logic to detect special renderings and to actually render them, add a minimap to all popups (if no minimap is defined seperately) 2021-06-27 19:21:31 +02:00
89c5c78f41 Small improvements to units 2021-06-25 18:30:56 +02:00
81ba9973e7 Add contributor list 2021-06-24 14:12:24 +02:00
651d987386 Add missing licenses 2021-06-24 12:35:15 +02:00
700f1be11d Formatting 2021-06-24 12:23:17 +02:00
7ca9ff4728 Add minimaps to climbing layer + translation sync 2021-06-24 02:35:55 +02:00
aa50d33b81 Merge master 2021-06-24 01:55:45 +02:00
9bbe13beff Fix translations for bookcase theme 2021-06-24 01:20:25 +02:00
7dc9d5cdb9 Translation sync 2021-06-24 01:19:33 +02:00
5e991bdc02 Allow to style special visualisations, no cursor if popups are disabled 2021-06-23 02:41:30 +02:00
eba1772ab9 Add minimap baseElement; add this as special rendering, add minimap beneath direction input element 2021-06-23 02:15:28 +02:00
a365172e0c Add new direction indicators 2021-06-23 01:58:11 +02:00
3e343dcf88 Update contributors 2021-06-22 15:12:18 +02:00
8b2aff0244 Add icons 2021-06-22 03:16:57 +02:00
966fcda8d1 Add support for units to clean up tags when they enter mapcomplete; add example of this usage in the climbing theme, add climbing theme title icons with length and needed number of carabiners 2021-06-22 03:16:45 +02:00
89f6f606c8 Merge branch 'master' into feature/units 2021-06-22 00:38:36 +02:00
8bca83d708 Generate translations 2021-06-22 00:38:18 +02:00
0012a2f683 First version of unit handling: canonicalizing on input 2021-06-22 00:29:07 +02:00
6489e93209 Add short description 2021-06-21 16:55:21 +02:00
68845fc2d7 Fix translations 2021-06-21 16:25:51 +02:00
06e0c27fef Fix license info 2021-06-21 14:12:44 +02:00
2f58b12188 Fix social image 2021-06-21 14:08:32 +02:00
263a240f67 Add social image, version bump 2021-06-21 13:55:48 +02:00
3d299983e1 Add youtube icon, move movie to the top 2021-06-21 13:52:48 +02:00
4996a8f05a Simplify regexes for climbing theme 2021-06-21 13:29:14 +02:00
cb64e6ca6e Add bolt, description and rock type questions 2021-06-21 13:00:21 +02:00
c25e039a91 Update to climbing theme 2021-06-21 03:14:03 +02:00
b9fb18ee4c Merge master 2021-06-21 00:18:59 +02:00
df4923d8bf Add difficulty and length overviews to climbing areas and crags 2021-06-21 00:02:45 +02:00
64bfc147bd Layer sync, fix climbing:grade:french:min and ~:max in translations 2021-06-19 20:06:28 +02:00
8e72b70742 Fix deployment, fix documentation generation, add a small markdown generator 2021-06-15 00:28:59 +02:00
ba8605ec9d Translation sync 2021-06-13 15:10:01 +02:00
b864d44fda Translation sync 2021-06-11 22:53:09 +02:00
061abd4a76 Translation sync 2021-06-10 14:06:28 +02:00
a8a4b797fd Add translation files for shared questions 2021-06-08 19:08:19 +02:00
2383d204d7 Translation sync 2021-06-08 16:56:36 +02:00
42aa763459 Translation sync 2021-06-06 14:18:34 +02:00
8c92ee698b Translation sync 2021-06-05 17:24:06 +02:00
2d9204df48 Merge master 2021-06-05 17:23:40 +02:00
Joost
483ae47294
forgot hashtag 2021-06-05 14:05:19 +02:00
Joost
673c187c64
TIL how to make green transparent 2021-06-05 14:04:13 +02:00
Joost
17ba9f28e9
Merge pull request #328 from pietervdvn/develop
Last changes to the speelplekken theme
2021-06-04 17:26:37 +02:00
833e3d8510 Translation sync 2021-06-04 17:23:17 +02:00
ce47886ce0 Merge branch 'master' into develop 2021-06-04 17:22:48 +02:00
e11c020ed4 Hide youtube player if no video is given 2021-06-04 17:07:26 +02:00
c2d94b7c26 Fix typo 2021-06-04 16:55:32 +02:00
1fd020aa4b Add video embed 2021-06-04 16:42:51 +02:00
188f0245fc Move isPolygon into OsmObject as it is more appropriate there 2021-06-04 15:38:06 +02:00
Joost
17b76be401 improved rendering
Colouring was also based on a field that has little meaning
2021-06-03 11:35:52 +02:00
427994181c Add missing license info 2021-06-01 12:12:37 +02:00
1a04f2e661 Move isPolygon into OsmObject as it is more appropriate there 2021-05-31 20:47:08 +02:00
69f4b96949 Add logo 2021-05-31 12:22:24 +02:00