Commit graph

925 commits

Author SHA1 Message Date
1bf3be987b Add name and species to tree title (if applicable); fix issue with dropdown in tagrenderingquestion 2022-04-22 16:24:21 +02:00
2fe67c7dc1 Merge branch 'master' into develop 2022-04-22 16:11:11 +02:00
849f95feec Remove test rendering from etymology theme 2022-04-22 16:10:25 +02:00
0aae923187 Add projected_centerpoint as pointrenderingoption 2022-04-22 16:09:55 +02:00
347b4df88d Add description 2022-04-22 02:03:20 +02:00
de8ce84bde Fix tree_node theme 2022-04-22 02:01:39 +02:00
eb5a6195b9
Merge pull request #770 from pdassori/patch-1
Update tree_node.json
2022-04-22 01:51:17 +02:00
700cad1000 Merge branch 'master' into develop 2022-04-22 01:48:47 +02:00
2d46821186 Translation sync 2022-04-22 01:48:40 +02:00
6a124da543 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-22 01:45:55 +02:00
389e3f18a0 Improve wikidata search with filtering, add search box for species to trees 2022-04-22 01:45:54 +02:00
f15dfa905a Small fixes to themes 2022-04-21 20:39:09 +02:00
pdassori
86d9a9b61c
Update tree_node.json
The Spanish translation "es" was made. In this window as title, I think it is better to consider tag: species over tag: name.  Since trees generally do not have a name, unless they are considered monumental or extraordinary (as in the example of the photo). On the other hand tag:species, includes all of them. species identifies a tree better.
2022-04-19 18:54:17 -04:00
4c9474f6d0 Translations 2022-04-19 23:43:51 +02:00
ccf9c4b5f6 Merge develop 2022-04-19 01:39:03 +02:00
303ccfa322 Translation sync 2022-04-18 01:47:54 +02:00
0f5c132287 Merge master 2022-04-15 01:19:44 +02:00
663f01c21e Extract some layers to standalone files 2022-04-15 00:56:42 +02:00
4af622575d Translation sync 2022-04-15 00:48:19 +02:00
18430df75a Merge master 2022-04-14 01:00:04 +02:00
8db80d879a Translation sync 2022-04-13 18:42:40 +02:00
de0a6a666e Translation sync 2022-04-13 01:20:52 +02:00
a63fed178b Attempt to fix #683 2022-04-09 21:44:37 +02:00
92f33a440e Revert "Translation sync + fix translation issue"
This reverts commit aaa59955cb.
2022-04-09 19:32:22 +02:00
aaa59955cb Translation sync + fix translation issue 2022-04-09 19:07:43 +02:00
0ec0367529 Translation sync 2022-04-09 17:35:21 +02:00
bcbbff0f2b Fix tagging: shop=rental instead of shop=bicycle_rental 2022-04-09 10:10:10 +02:00
679422e26c Fix duplicate ids: actually rewrite id 2022-04-08 22:13:58 +02:00
4235c42463 Add bicycle_rental questions to bike shops 2022-04-08 21:53:29 +02:00
13c2c2309c Add condition to bicycle rental type, add clarification in cyclofix to shop=rental 2022-04-08 20:53:42 +02:00
dbf5b04d1a Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-04-08 18:03:26 +02:00
a46b6d1e27 Merge branch 'develop' 2022-04-08 17:59:44 +02:00
riQQ
4b84c62f76
Editorial improvements to Chargings Station theme readme 2022-04-08 13:05:47 +02:00
f59b2aee33 Add 'needles' as waste category 2022-04-08 01:25:10 +02:00
f61df52c7d Fix wrong title in recycling layer 2022-04-08 01:13:36 +02:00
6e3dd6a8d5 Translation sync 2022-04-07 03:14:21 +02:00
c8e8908148 Merge branch 'master' into develop 2022-04-07 03:13:34 +02:00
855959d623 Translation sync 2022-04-07 03:13:29 +02:00
Robin van der Linde
b4052b8f63
First version of transit/bus theme 2022-04-06 21:37:31 +02:00
df706d2f97 Small fixes, add filters to shops 2022-04-04 05:12:14 +02:00
a05e611326 Fix typo 2022-04-03 03:29:58 +02:00
6beebcd4ef Merge master 2022-04-03 03:26:26 +02:00
c2f7403f04 Translation sync 2022-04-03 03:17:10 +02:00
b6aa99ef74 Remove name from note_import template 2022-04-03 03:14:52 +02:00
320f38802d Add article to presets 2022-04-03 03:13:21 +02:00
18729049b7 Translation sync 2022-04-03 03:01:16 +02:00
6c1a1d59f3 Fix #716 2022-04-03 02:37:31 +02:00
2c7fb556dc Add translation buttons 2022-04-01 12:51:55 +02:00
37c00bbf99 Merge branch 'master' into develop 2022-03-29 22:10:44 +02:00
78b54d2fce Automatically add articles to presets to transition 2022-03-29 22:02:21 +02:00
eb71995b97 Translation sync 2022-03-29 21:38:24 +02:00
bedc0eb690 Merge master 2022-03-29 21:31:16 +02:00
d0abf14806 Fix filter on notes theme, fix #713 2022-03-29 21:24:44 +02:00
c47a6d5ea7 Add rewrite of 'special' clauses, various QOLimprovements on import viewer 2022-03-29 00:20:10 +02:00
8df0324572 Add website to playground theme 2022-03-28 22:20:36 +02:00
308ab74a08 Add download-as-svg options 2022-03-18 01:21:00 +01:00
bed1352e37 Merge master 2022-03-17 23:11:20 +01:00
2ded4fccfb Translation sync 2022-03-16 14:07:41 +01:00
dc42483edf
Add label to shops 2022-03-16 00:20:15 +01:00
daa23fad95 Merge master 2022-03-15 13:45:20 +01:00
4f4fc650b1 First steps to a real testing framework: first working version with mocha, chai and doctest-ts 2022-03-14 22:57:01 +01:00
2cbebfe8d4 Fixed shadowed mapping 2022-03-14 20:59:06 +01:00
edc366149b Merge master 2022-03-14 20:52:06 +01:00
b406d17b10 Add more bicycle options to cycle rental; add deletion and images to cycle rental, fix #703 2022-03-14 20:45:17 +01:00
2ceeb15a67 Add tandems, add images to cycle rental 2022-03-14 17:14:25 +01:00
564fb16135 Translation sync 2022-03-14 17:11:15 +01:00
9e81d41d25 Add images to bicycle rental 2022-03-14 17:01:47 +01:00
f20144a502 Merge master 2022-03-14 03:34:42 +01:00
d7df6a7a80 Improvements to notes layer and elements 2022-03-13 02:46:42 +01:00
aa7e6565db Small fix to playgrounds 2022-03-11 02:40:27 +01:00
0497b10e04 Add 'paid playground' as access option 2022-03-11 02:25:39 +01:00
1455a87077 Merge master 2022-03-11 01:31:13 +01:00
7d02ed0af6 Add 'access=key' as option 2022-03-10 23:41:16 +01:00
7acaafae1f Fix icons 2022-03-10 16:26:25 +01:00
67fd7028f1 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-03-08 04:15:22 +01:00
135d8644da Better social images 2022-03-08 04:09:03 +01:00
Robin van der Linde
e1a9a14d74
Add Dutch traffic signs, hide questions if traffic signs not known (#679)
* Add Dutch traffic signs, hide questions if traffic signs not known

* Move images to subfolders

* Merge develop, regen docs

Co-authored-by: pietervdvn <pietervdvn@posteo.net>
2022-03-08 01:11:32 +01:00
67c8d08f3e Some fixes in the rewrite of the maprendering 2022-03-08 01:05:54 +01:00
e6185b8dca Merge branch 'master' into develop 2022-03-02 16:00:06 +01:00
bd3f4bb474 Merge branch 'master' of github.com:pietervdvn/MapComplete 2022-03-02 15:10:49 +01:00
b21dbabe5e Fix #686 in the script 2022-03-02 13:16:52 +01:00
98c40822a2 Fix csvToJson script 2022-02-28 19:28:59 +01:00
7a540ea6ce Translation sync, fix typo 2022-02-27 15:54:50 +01:00
86351f30f4 Hide docking_station bicycle rentals on lower zoom to prevent them flooding the map 2022-02-25 15:38:48 +01:00
5b13d3f25c Merge branch 'develop' 2022-02-22 16:13:59 +01:00
247b2e4db1 Translation sync 2022-02-22 16:13:49 +01:00
793d765ead Add contact information to recycling centers 2022-02-22 16:11:00 +01:00
bc890f5476 Merge branch 'master' into develop 2022-02-22 14:14:01 +01:00
be41ead9bf Translation sync, small fixes 2022-02-22 13:43:36 +01:00
d19791382f Add move and delete options 2022-02-21 11:39:57 +01:00
eddaca7767 Fix typo 2022-02-20 01:46:31 +01:00
9b7a47136c Merge branch 'develop' into waste-theme 2022-02-20 00:47:21 +01:00
Robin van der Linde
2e51a45668 Use icon of waste if only one is set 2022-02-19 22:52:52 +01:00
Robin van der Linde
d49fd8df1f Add white background to icon 2022-02-19 21:40:12 +01:00
Robin van der Linde
cc086eaee1 Allow changing type 2022-02-19 21:37:54 +01:00
798556f6d3 Extract images from watermill.json and trail.json 2022-02-19 17:50:06 +01:00
c06f8820a8 Extract images from slow_roads.json 2022-02-19 17:47:12 +01:00
812626456d Fix dead image 2022-02-19 17:44:25 +01:00
d9d6e96fed Extract images from crossings.json 2022-02-18 23:12:46 +01:00
682b68a094 Regenerate schemas, more fixes to images and licenses 2022-02-18 23:10:27 +01:00
Robin van der Linde
62153e0eb4 Small fixes (organic and appliances) 2022-02-18 11:52:44 +01:00
5ab2e8eabe Extract images for hydrant.json 2022-02-18 04:31:36 +01:00
4ab3d56452 Remove duplicate question, fix english translations 2022-02-18 04:29:41 +01:00
78c60ad549 Fix images in cycleways_and_roads.json 2022-02-18 04:22:09 +01:00
628cffbf0b Extract images from bike_parking.json 2022-02-18 04:12:31 +01:00
8508c86c39 Extract images in barrier.json 2022-02-18 04:10:23 +01:00
32c9f53ff1 Translation sync 2022-02-18 04:06:43 +01:00
cc45fd23b8 Merge branch 'develop' into refactoring/checks-and-icons 2022-02-18 03:55:01 +01:00
1103f8f157 Merge develop 2022-02-18 03:53:15 +01:00
01def612cf Translation sync 2022-02-18 03:27:21 +01:00
ccf059a20b Extract images from tagrenderings 2022-02-18 03:21:54 +01:00
f2d022664a Convert tagrendering-mappings with images to tagrendering-mapping with an icon 2022-02-18 03:16:05 +01:00
0e83d5be79 Merge branch 'waste-theme' of github.com:pietervdvn/MapComplete into waste-theme 2022-02-18 00:06:35 +01:00
8264e8bfc7 Merge develop 2022-02-18 00:05:28 +01:00
2742f03ebf First fixes for charging station theme 2022-02-17 23:58:03 +01:00
f55e5cf26c Fix various issues in themes 2022-02-17 23:56:53 +01:00
Robin van der Linde
e2dc9e1490 Fix translations 2022-02-17 20:31:21 +01:00
Robin van der Linde
879536c823 Changed zoom levels, other details 2022-02-17 14:34:43 +01:00
Robin van der Linde
41009abe5d Change icon 2022-02-17 13:52:16 +01:00
Robin van der Linde
bb30c353b4 Fix typo 2022-02-17 13:47:59 +01:00
Robin van der Linde
010bd7cdc1 Fix filters, add plastic 2022-02-17 11:03:11 +01:00
Robin van der Linde
aabd6636c7 Merge branch 'develop' into waste-theme 2022-02-17 08:50:55 +01:00
b9ff8667a9 Fix last untranslated strings, make these errors again 2022-02-16 22:18:58 +01:00
07823087e1 More missing translations 2022-02-16 21:25:18 +01:00
61afce4197 More translation validations 2022-02-16 03:22:16 +01:00
bf05a88afd Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-02-16 02:31:39 +01:00
92f5b57c9f Add validation rule: public themes should have a complete translation in english 2022-02-16 02:23:50 +01:00
e721146ca1 Show loading screen when logging in 2022-02-15 15:42:09 +01:00
2ea363f6e0 Add bicycle rental presets 2022-02-14 19:00:25 +01:00
419f2b1351 Fix personal theme, add possibility to sync layer selection 2022-02-14 18:18:05 +01:00
4f45fed45a Fix webmanifest images 2022-02-14 16:12:38 +01:00
84b14cd7e4 Translation sync 2022-02-14 16:02:08 +01:00
66d2d167a2 Merge branch 'master' into develop 2022-02-13 20:59:10 +01:00
d193c34f05 Fix translations 2022-02-13 20:58:21 +01:00
8876d8748e Merge and sync translations 2022-02-13 20:54:31 +01:00
b2741e1b6d Fix tests 2022-02-11 19:56:31 +01:00
5bfcfa8536 Tweaks to cyclofix, add circle for 'pin je punt' 2022-02-11 19:21:53 +01:00
44603536fc Add question on bike repair station access 2022-02-11 02:05:33 +01:00
6ff4d22de3 Add question on accessibility of bicycle pumps 2022-02-11 02:03:33 +01:00
fa2e9db571 Merge branch 'develop' 2022-02-11 01:29:50 +01:00
3d2b55f9f1 Various styling and language tweaks 2022-02-11 01:20:01 +01:00
b920753544 s/picnictafel/picknicktafel/ 2022-02-11 00:27:45 +01:00
db770f2c35 Fix the last fake images, fix non-square theme icons, throw an error on fake svgs and non-square icons (if public theme) 2022-02-10 23:10:39 +01:00
b3c58ae82e Extract and validate images using a new conversion, regenerate docs 2022-02-09 22:37:21 +01:00
65dbcd774b Fix tests 2022-02-09 03:46:50 +01:00
186b8a79ac Add example images to presets, fix these in bike_repair_station, add more repair_stand examples, fix fake svgs, wording updates 2022-02-09 03:38:40 +01:00
58cd866e54 Rephrasing of charging station items 2022-02-09 02:24:37 +01:00
c18c8196a3 Remove png-parts from svg 2022-02-09 02:21:33 +01:00
729b5ce828 Small rewordings 2022-02-09 02:01:02 +01:00
b0dc38fcb0 Formatting 2022-02-09 01:59:39 +01:00
4642e34da7 Fix some feedback on Toerisme Vlaanderen theme about playgrounds-theme 2022-02-09 00:47:41 +01:00
1fed27abde Small fixes to preset texts 2022-02-09 00:34:01 +01:00
688dcae3b0 Various theme, icon and language fixes 2022-02-08 18:29:21 +01:00
b96c4f41fa Furhter cleanup of fake svgs 2022-02-08 02:24:37 +01:00
83acec30d4 Use labels to hide some questions in toerisme_vlaanderen theme 2022-02-08 02:24:24 +01:00
73984ad462 Convert SVGs with embedded png into proper SVG 2022-02-07 01:55:47 +01:00
dd63ed7ab0 Add detection for svgs which actually contain pngs, convert png into proper svg 2022-02-06 03:02:45 +01:00
278fce8726 Fix #640: generate an icon with a white background automatically 2022-02-06 01:57:33 +01:00
3e2c6a0f23 Improvements to themes 2022-02-04 02:48:31 +01:00
516c3a10d7 Translation sync 2022-02-04 01:30:39 +01:00
84a6170e3e Remove unneeded translations 2022-02-04 01:24:47 +01:00
e6cb3bc22a Tweaks to the observation_tower theme 2022-02-04 01:21:45 +01:00
7eeffc2305 Refactoring of conversion 2022-02-04 01:05:35 +01:00
62b646da99 Add icons of toerisme_vlaanderen styling; make maxspeed=30 and motor_vehicle:overtaking=no a belgian-only preset for cyclestreets, fix various consistency bugs and styling tweaks 2022-02-04 00:40:30 +01:00
aaaf0b8c36 More styling tweaks and bug fixes 2022-02-01 19:02:46 +01:00
f3f7fde29d Fix build 2022-02-01 13:16:38 +01:00
c15f3d2036 Lots of styling tweaks, add filter links between layers 2022-02-01 04:14:54 +01:00
d1e99fc2d3 Cyclestreets: only add maxspeed=30 in Belgium; change 'language' to 'locale' in changeset tags, load notes in import_viewer up to two years back, language tweaks 2022-01-31 20:52:56 +01:00
a11e0fc545 Merge master 2022-01-31 20:12:11 +01:00
5a9f26081c Natuurpunt tweaks 2022-01-31 14:34:06 +01:00
74489d5e3f Merge master 2022-01-30 19:06:41 +01:00
a4fc9ef67e Small fixes to bicycle cleaning layer 2022-01-30 18:34:03 +01:00
9594868e83 Better tag rewriting, add icons, add bicycle rental theme 2022-01-29 02:45:59 +01:00
275f7380ed Translation sync 2022-01-27 01:33:28 +01:00
99edba4c73 Merge master 2022-01-26 21:12:25 +01:00
791c6c4f55 Include route=foot in trails 2022-01-25 18:20:15 +01:00
e404e48f29 Add 'hide import notes'-filter 2022-01-24 03:09:50 +01:00
913dc07eea Merge branch 'master' into develop 2022-01-21 14:58:35 +01:00
df168413d0 Translation sync 2022-01-21 14:55:05 +01:00
b10d947072 Merge branch 'master' into waste-theme 2022-01-21 02:34:27 +01:00
f70fcfe75f Merge branch 'master' into develop 2022-01-21 02:29:49 +01:00
af2c617423 Translation sync 2022-01-21 02:29:44 +01:00
ca1490902c Finish importer, add applicable import layers to every theme by default 2022-01-21 01:57:16 +01:00
3402ac0954 Lots of refactoring, first version of the import helper 2022-01-19 20:34:04 +01:00
5c71bfa294 Attempt to fix social image previews 2022-01-18 20:18:12 +01:00
25f956c808 Autoreformat all the things 2022-01-18 18:52:42 +01:00
d4d7ab6f3a More fixing, first complete version of UK-addresses-theme 2022-01-17 23:50:50 +01:00
2001aae10d Merge branch 'master' into develop 2022-01-15 02:47:08 +01:00
eba52836b2 Cosmetic changes to toerisme_vlaanderen theme 2022-01-14 15:46:45 +01:00
6ae8ec8036 Add 'add new note' functionality, fix bug where 'test'-theme comes up when deleting images 2022-01-14 01:41:19 +01:00
6999a73d44 Add import from notes functionality 2022-01-12 02:31:51 +01:00
2697feebe0 Merge branch 'master' into develop 2022-01-11 11:45:27 +01:00
cc1c0960b0 Fix translations 2022-01-11 11:42:53 +01:00
722493cf9c Merge branches 2022-01-11 11:32:46 +01:00
d2b8a78ab8 Translation sync 2022-01-11 11:32:10 +01:00
d92dec6a0f Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-01-11 11:28:03 +01:00
Robin van der Linde
8e624b4122 Fix build and add unmarked crossing (#609) 2022-01-11 10:29:14 +01:00
riQQ
59c25f8b0e
Use approved tag cycle_barrier in the barrier layer
This replaces all references to the niche tag cycle_barrier:type with the approved tag cycle_barrier in the barrier layer.

Fix #610
2022-01-11 00:37:18 +01:00
e0b58a0f55 Import work 2022-01-10 19:10:13 +01:00
Robin van der Linde
b5bfd6558b Add waste_assen, add location for disposal 2022-01-09 17:39:51 +01:00