Commit graph

651 commits

Author SHA1 Message Date
pgm-chardelv1
ccf1e636ee Merge remote-tracking branch 'origin/develop' into project/cycle-infra 2021-07-27 15:16:55 +02:00
pgm-chardelv1
1953d9c417 Add some untested changes to options for cycleway:surface 2021-07-27 15:16:51 +02:00
0319f94735 Fix bicycle lib icon 2021-07-26 21:11:11 +02:00
13b2c1b572 Finishing touches to export functionality, enable it in cycle_infra 2021-07-26 20:59:55 +02:00
e0b71ca53e Wire in aspected-routing as calculated tag 2021-07-26 20:21:05 +02:00
70da6685e1 Fix themes + fix tests 2021-07-26 17:38:56 +02:00
0fbde7ec24 Merge develop 2021-07-26 16:59:51 +02:00
Robin van der Linde
d11e0be34a Fixed signs 2021-07-26 15:13:34 +02:00
pgm-chardelv1
77c05daca8 Added attribution for cycle-infra.svg 2021-07-26 14:04:23 +02:00
00e2f56d3e Remove all old 'hideUnderlayingFeaturePercentages' as they aren't used anymore; check in script; fix #431 2021-07-26 10:37:11 +02:00
177649614d Rename some themes for more consistency, check of theme-ids, see #431 2021-07-26 10:13:50 +02:00
Ward
97c85d6909 extra translations 2021-07-26 09:55:13 +02:00
330930d5d4 Merge develop 2021-07-24 02:32:33 +02:00
cc22c5b0fb Merge develop 2021-07-23 19:14:10 +02:00
135219b5dc Add point-only layer for nature reserves, mark point-only layer as old (so that geometries will show up) 2021-07-23 19:12:13 +02:00
e121099562 Use builtin without wrapping them in an array 2021-07-23 17:17:58 +02:00
c3c8525841 Merge master 2021-07-23 15:51:23 +02:00
Robin van der Linde
8e232b88bc Add sign images 2021-07-22 21:18:00 +02:00
Robin van der Linde
eed59ac916 Added supplementary traffic_sign 2021-07-22 17:00:54 +02:00
pgm-chardelv1
7b2c048974 Adds icons for street & bicycleway + attributons 2021-07-22 16:52:49 +02:00
pgm-chardelv1
257a6e0756 Merge branch 'project/cycle-infra' of https://github.com/pietervdvn/MapComplete into project/cycle-infra 2021-07-22 16:16:58 +02:00
pgm-chardelv1
dce06846c4 Change Base layer 2021-07-22 16:16:52 +02:00
Robin van der Linde
759edb802d Update translations 2021-07-22 15:56:49 +02:00
karelleketers
113e850b2f Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt 2021-07-22 13:25:15 +02:00
karelleketers
1e07c8c44c Added parking badges 2021-07-22 13:22:31 +02:00
pgm-chardelv1
a96310dc0a Merge changes 2021-07-22 12:08:34 +02:00
pgm-chardelv1
9c84b9cf2e New color scheme 2021-07-22 12:04:59 +02:00
2c9f737cbd Enable caching, add different background 2021-07-22 10:52:07 +02:00
Robin van der Linde
63708ea568 Seperation and traffic sign 2021-07-22 10:31:44 +02:00
pgm-chardelv1
8660f73ac1 Minor changes to base layer | Fixes some typos 2021-07-22 10:00:24 +02:00
Robin van der Linde
0f8d3471dc Cyclestreet question fixed for new cycleways 2021-07-22 09:43:24 +02:00
Robin van der Linde
192c7568da 💬💚 Updated translations, and hopefully fixed build 2021-07-20 16:52:01 +02:00
Robin van der Linde
526542f7ef Cyclestreets options and cycleway=no 2021-07-20 16:30:08 +02:00
karelleketers
ec10a0fbe1 Changed icons and adjusted zoom levels 2021-07-20 16:23:44 +02:00
Robin van der Linde
95de6c7055 cycleway:buffer 2021-07-20 14:45:42 +02:00
Robin van der Linde
778c98fa02 Update translation 2021-07-20 14:17:32 +02:00
Robin van der Linde
894ef68d0f Cyclestreet moved to seperate question, traffic_signs added 2021-07-20 14:14:20 +02:00
4fa9159da1 First working version of a width measurment tool 2021-07-20 01:33:58 +02:00
Robin van der Linde
209959392a Cycle barrier measurements 2021-07-19 16:43:01 +02:00
Robin van der Linde
da7faf0a8f Added cycle_barrier type, red turn 2021-07-19 16:07:30 +02:00
Robin van der Linde
bdbf874c63 Added presets and cycle_barrier type 2021-07-19 14:00:23 +02:00
karelleketers
d585ec9048 Reset speelplekken temp 2021-07-19 13:25:24 +02:00
karelleketers
4d335f8d1a Reset speelplekken 2021-07-19 13:13:23 +02:00
Robin van der Linde
10f7305bf0 Updated translations
- Added presets for crossing
2021-07-19 13:12:18 +02:00
karelleketers
34d94e36ec Merge branch 'project/natuurpunt' of https://github.com/pietervdvn/MapComplete into project/natuurpunt 2021-07-19 11:28:19 +02:00
karelleketers
58b46bcc39 Changed zoomlevels Natuurpunt + Nat res width 2021-07-19 11:27:31 +02:00
61f2ebf9ba Merge branch 'develop' into feature/road-splitting 2021-07-18 20:24:59 +02:00
de0802eef6 Merge master 2021-07-18 20:23:46 +02:00
76fa147670 Fix deployment (once more) 2021-07-18 20:16:28 +02:00
973cd7ada3 Fix speelplekken-temp 2021-07-18 20:07:08 +02:00
288501343c Install caching 2021-07-18 18:44:39 +02:00
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
b55f9a25c6 More work on refactoring the changes handling 2021-07-18 14:52:09 +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
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
dc4cdda3b5 Translation sync 2021-07-15 00:39:40 +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
f4d5557534 Added crossing to bicycle_infra 2021-07-14 11:40:00 +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
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
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
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
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
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
58812b50f2 Small improvements to fritures theme: add vegetarian and opening hours indicators 2021-06-28 01:19:03 +02:00
89c5c78f41 Small improvements to units 2021-06-25 18:30:56 +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
7dc9d5cdb9 Translation sync 2021-06-24 01:19:33 +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
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
b864d44fda Translation sync 2021-06-11 22:53:09 +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
69f4b96949 Add logo 2021-05-31 12:22:24 +02:00
8b44dc1f8a Add introduction text 2021-05-31 12:22:04 +02:00
326f86f41f Translation sync 2021-05-31 00:20:52 +02:00
2fe6b64fb3 Merge branch 'master' of github.com:pietervdvn/MapComplete 2021-05-30 21:56:48 +02:00
e0dc43c1e7 Sync translations 2021-05-30 20:55:08 +02:00
e65a984459 Add translations to cyclestreets 2021-05-30 02:02:42 +02:00
67c8311baa Translation sync 2021-05-28 12:58:53 +02:00
1487411a25 Sync translations 2021-05-27 21:20:04 +02:00
5503d951aa Merge branch 'master' of github.com:pietervdvn/MapComplete 2021-05-27 21:18:15 +02:00
f837d60756 Fixes to contribution panel 2021-05-27 18:56:02 +02:00
Joost
b1a6687eb2
update URL to project website 2021-05-25 14:48:34 +02:00
9cb591dfc3 Totally not cheating 2021-05-20 19:01:29 +02:00
ba835dd2fa Translation sync 2021-05-20 17:00:41 +02:00
cd1c7c3e5e Sync translations 2021-05-20 00:10:38 +02:00
8065c18fe1 Pretty printing the theme files 2021-05-19 23:57:26 +02:00
5c8626ee7b
Merge pull request #284 from leovilok/personalLayout-fr
Add french translation for personalLayout
2021-05-19 15:03:02 +02:00
Léo Villeveygoux
12854c6e5b Add french translation for personalLayout 2021-05-18 23:21:18 +02:00
85fa3886aa Small tweaks 2021-05-18 19:48:20 +02:00
3ddf7c660e Merge branch 'master' of github.com:pietervdvn/MapComplete 2021-05-18 00:45:32 +02:00
4fb70c49fc Add layer icons 2021-05-17 17:27:28 +02:00
554fefd708 Add various small assets and improvements 2021-05-17 17:10:24 +02:00
Sebastian Kürten
b58d6c6c3c Delete accidentally added Vim swap file for Waldbrand theme 2021-05-17 08:42:07 +02:00
ebc89385ea Attempt to update icon based on survey date, small translation update 2021-05-17 00:16:54 +02:00
a8463ac0ce Documentation updates, use HOT layers for aed_brugge 2021-05-16 15:50:09 +02:00
d547b9f968 Fix metatagging and calculated tags in heterogenous data settings 2021-05-16 15:34:44 +02:00
Léo Villeveygoux
cb6d9095de Add french translation for sport_pitches 2021-05-16 04:54:07 +02:00
Joost
2f1276c4e9
fixed typo 2021-05-15 12:38:38 +02:00
19f900deab Do not include extra items, fix link to walking routes 2021-05-14 02:58:57 +02:00
6f457a6f0d Do not show out-of-range features on speelplekken layer, fix handling of mutlipolygons in 'inside', better tests 2021-05-14 02:25:30 +02:00
Sebastian Kürten
ae10a6a9a8 Fix two wordings in the German translations; fix a few full-stops 2021-05-13 08:03:45 +02:00
1c42f7881e Add shadow 2021-05-03 22:57:30 +02:00
ca60f36acf Add shadow geojson 2021-05-03 22:36:22 +02:00
f2281b2cd3 Color and icon updates 2021-05-03 22:22:01 +02:00
3dcd53f751 Automated documentation updates 2021-05-03 17:48:15 +02:00
Midgard
a6a897b7a0 Fix and update hailhydrant source URLs 2021-04-28 17:21:06 +02:00
6b9d0162eb Speelplekken style tweaks 2021-04-25 16:01:33 +02:00
7fa8d5efd0 Add release notes and theme creator name 2021-04-25 14:24:14 +02:00
0aad17e63c Add living_street explanation, tweaked zoom levels 2021-04-25 13:22:50 +02:00
d2fa20ee91 Remove console.log, tweaks to zoomlevels 2021-04-23 20:27:01 +02:00