Commit graph

2455 commits

Author SHA1 Message Date
Robin van der Linde
87107de57a
Merge branch 'develop' into feature/fitness-station 2022-10-13 19:34:43 +02:00
f1c57c7f8c
Merge pull request #1025 from pietervdvn/post-partner
Post partners and parcel lockers
2022-10-13 00:06:20 +02:00
Robin van der Linde
610159ca43
Speed camera layer 2022-10-12 21:09:45 +02:00
Robin van der Linde
b5c3972104
Add sports centre layer 2022-10-12 18:42:34 +02:00
Robin van der Linde
4cb0cf8b8b
Merge branch 'develop' into feature/fitness-station 2022-10-11 14:45:53 +02:00
Robin van der Linde
6877e96a05
Merge branch 'develop' into post-partner 2022-10-11 13:49:48 +02:00
Robin van der Linde
523d6353f7
Fix build 2022-10-11 13:41:04 +02:00
Robin van der Linde
ab162d3a63
Merge branch 'develop' into feature/bicycle_road 2022-10-11 13:10:47 +02:00
c7652b16c1 Fix BAG-layer 2022-10-11 01:54:01 +02:00
deea498b9b Add safety check in the case tag calculation failed 2022-10-11 01:28:47 +02:00
d562e7fd7c Change regex parsing to avoid runaway matches 2022-10-11 01:01:24 +02:00
c968d7d454
Merge pull request #1098 from wjtje/feature/bag-import
BAG data import helper theme
2022-10-10 21:23:40 +02:00
4af4eb24b8 Remove stadia background layers, fix #1096 2022-10-10 21:12:05 +02:00
Robin van der Linde
7b37c248b2
Add some descriptions, move minzoom 2022-10-10 10:11:03 +02:00
wjtje
46613d7e17
Added option to upload adress from BAG 2022-10-09 21:39:23 +02:00
Nadhem
4ab82166f8 Merge branch 'feat/add-osm-community-index-layer' of github.com:Nadhum/MapComplete into feat/add-osm-community-index-layer 2022-10-09 04:37:46 +01:00
Nadhem
89186c8610 fix: resize svgs 2022-10-09 04:37:10 +01:00
Nadhem
ad87ebc6f4
nit: remove unintentionally added lines 2022-10-08 22:44:04 +01:00
Nadhem
e85cf43ffb feat(themes): add osm community index as a layer 2022-10-08 22:40:27 +01:00
wjtje
44bafa4318
Updated building type question, auto remove construction key 2022-10-07 13:29:46 +02:00
wjtje
d280237f89
Added an options to change building type of osm building 2022-10-06 21:50:12 +02:00
wjtje
d2e2c4ab14
🌐 Updated text
- Fixed a small issue
2022-10-06 21:35:15 +02:00
wjtje
7b73138f24
Added import button
- Import button will show when the object isn't in osm
- A conflate button to update data in osm
2022-10-06 15:06:49 +02:00
wjtje
d111661f2e
Show buildings from OSM
- Show overlapping buildings
- Show imported buildings
2022-10-06 14:28:36 +02:00
Wouter van der Wal
dfbe9ebd48
Merge branch 'pietervdvn:develop' into feature/bag-import 2022-10-06 09:59:04 +02:00
06ed9b4904 Add social image for the repo 2022-10-05 00:42:32 +02:00
6b24a3c693 Add streetwidth theme again 2022-09-27 19:30:46 +02:00
069510b6f5 Add images to kerbs, fix #1070 2022-09-27 19:01:10 +02:00
91a5e55d90 Fix warning in filters.json 2022-09-27 18:54:21 +02:00
6a3821ffd8 Reformatting 2022-09-26 19:18:11 +02:00
59a1d88256 Fix licenses 2022-09-26 14:35:08 +02:00
90dfe7298f Translation reset 2022-09-24 03:39:32 +02:00
dadba86faf Add check for possible duplicate filters, consolidate duplicate filters 2022-09-24 03:33:09 +02:00
aaa7439b02 Add A2 poster, fix pointer events, add templates to build output 2022-09-20 12:50:36 +02:00
d50fd663ef Fix translations 2022-09-19 13:45:59 +02:00
d618124d33 Add opened_now filter to pharmacy and doctors 2022-09-19 13:38:13 +02:00
34ef6ce40e Merge master 2022-09-19 12:39:19 +02:00
e5c20d72f4 Fix build 2022-09-18 20:28:41 +02:00
a70726f0aa Translation sync 2022-09-18 20:04:20 +02:00
b912343805 Bugfixes, add A3 poster 2022-09-18 12:45:02 +02:00
1f87728782 More work on the flyer 2022-09-17 21:35:56 +02:00
9c961d32b3 Add UI flow to generate flyers 2022-09-17 03:24:01 +02:00
bc86db2815 Merge branch 'develop' into feature/flyer 2022-09-16 19:01:07 +02:00
1f4304d515 Translation sync 2022-09-16 19:00:59 +02:00
d40e2b782c Merge develop 2022-09-16 19:00:25 +02:00
ba0046120f Near-finished flyer 2022-09-16 02:08:28 +02:00
de4e394088 More tweaks 2022-09-15 14:17:39 +02:00
306854f0ad Add wikipedia of artist 2022-09-14 17:18:48 +02:00
585dbb4587 allow reuse of filters, update to artwork theme 2022-09-14 16:29:41 +02:00
a1a12e6f38 Merge master 2022-09-14 14:45:36 +02:00
739275f8a1 Some tweaks 2022-09-14 14:43:14 +02:00
f6fa8c9f9f Housekeeping... 2022-09-14 13:35:54 +02:00
27ccce70c0 More work on the flyers 2022-09-14 12:21:13 +02:00
921132b478 Update to templates 2022-09-14 04:02:40 +02:00
b65e954999
Use 'wikipedia'-question instead of custom question 2022-09-13 01:55:10 +02:00
d186b207de More work on the flyer 2022-09-13 00:42:29 +02:00
c4404d68f9 Merge branch 'develop' into feature/flyer 2022-09-13 00:30:35 +02:00
b1a07cd841
Add delete option for doctors 2022-09-12 19:17:41 +02:00
Robin van der Linde
986966b068
Fix pedestrian layer 2022-09-12 10:44:07 +02:00
Robin van der Linde
4bb80cab0a
Merge branch 'develop' into feature/station-map 2022-09-12 10:34:17 +02:00
Robin van der Linde
cf91e4fe54
Basic station map 2022-09-12 10:33:52 +02:00
6c3f9bae25 Make fixme optional if stated in the softDeletionTags 2022-09-11 01:25:56 +02:00
4e346c2820 More vehicle type restrictions to remove 2022-09-11 01:05:53 +02:00
e0b2a67fae Add images and delete option to barriers 2022-09-11 00:55:15 +02:00
9d753ec7c0 Experimenting with JS-pdf 2022-09-11 00:44:51 +02:00
cc74b73738 Housekeeping... 2022-09-10 13:25:18 +02:00
Brice Maron
e45e1fa786 add space after prefix to avoid taking out part of words 2022-09-08 23:28:21 +02:00
Brice Maron
908e1e46d3 add few declinaisons of prefixes 2022-09-08 23:27:43 +02:00
Brice Maron
d6c73441b0 chore(deps): upgrade tailwind 2022-09-04 21:04:13 +02:00
d919fb6fa9 Merge branch 'master' into develop 2022-09-03 20:31:28 +02:00
8356c73932 Fix wrong tags in bike-cleaning mappings, see #1059 2022-09-03 20:30:35 +02:00
ee7d05cbad Improvements to statistics 2022-09-02 21:40:13 +02:00
b19144f7b3 Merge branch 'master' into develop 2022-09-02 13:08:25 +02:00
1733c2aa9e Housekeeping... 2022-09-02 13:07:23 +02:00
a5aae3c57c Housekeeping... 2022-09-02 12:54:41 +02:00
Brice Maron
5d524629b4 feat: add color for streets with no cycleways 2022-09-01 22:31:00 +02:00
Robin van der Linde
af53817eb4
Fix Maproulette icon showing on other layers 2022-08-29 15:28:29 +02:00
Robin van der Linde
c7526573b9
Add label and sport shops 2022-08-27 11:57:42 +02:00
Robin van der Linde
959bd0da1c
Add more questions 2022-08-27 10:39:14 +02:00
Robin van der Linde
9d4140e49d
Basics for sport theme with fitness stations 2022-08-27 00:12:21 +02:00
25ec71aff1 Merge plant_detection 2022-08-24 15:08:08 +02:00
ba8219a10c Housekeeping... 2022-08-24 14:47:36 +02:00
08341b70af Merge branch 'master' into develop 2022-08-24 13:40:41 +02:00
27c7767382 Housekeeping... 2022-08-24 04:09:07 +02:00
dfea3feb32 Remove empty strings from translation files 2022-08-24 04:05:49 +02:00
d00344a60c Merge weblate translations and regenerate translations 2022-08-24 03:20:01 +02:00
1c1040a834 Merge master 2022-08-24 03:17:34 +02:00
52edaf39c8 Housekeeping... 2022-08-24 03:09:51 +02:00
1ed6052f78 Merge branch 'develop' into feature/bicycle_road 2022-08-24 02:33:50 +02:00
1bde480123 Fix typo in postboxes theme 2022-08-24 02:31:28 +02:00
aac736eba8 Revert "Improve typing"
This reverts commit 4d783aae45.
2022-08-24 02:28:41 +02:00
4d783aae45 Improve typing 2022-08-24 02:22:06 +02:00
f75551d29b
Merge branch 'develop' into feature/bicycle_road 2022-08-24 01:57:02 +02:00
0e03fb5e7e Remove text in svg icon 2022-08-24 01:49:00 +02:00
cb34534f40
Merge branch 'develop' into feature/parcel-locker 2022-08-24 01:47:27 +02:00
03dad39949 Plantnet-detection: finishing touches 2022-08-24 01:08:54 +02:00
d713e00671 Add attribution for plantnet, styling tweaks 2022-08-23 16:15:53 +02:00
51650b4a10 Translation sync 2022-08-22 22:31:05 +02:00
7be371f24a Remove versions (as they are unused), move 'maintainer' to optional 'credits'-field 2022-08-22 19:17:24 +02:00
fd9185dd73 Small reformatting 2022-08-22 19:17:24 +02:00
716fda39aa Add new statistics view 2022-08-22 19:17:23 +02:00
b67a80e275 New statistcs view 2022-08-22 19:17:23 +02:00
06f8cf7006 First working plantnet UI 2022-08-22 19:16:37 +02:00
Reiner Herrmann
814265762d
etymology: add "Weg" to postfixes that get removed
"Weg" (way) is a common suffix in street names in Germany.
2022-08-21 16:25:12 +02:00
Robin van der Linde
74995fcdad
Remove post_partner questions 2022-08-18 19:51:58 +02:00
Robin van der Linde
6b2f61745e
Change icon 2022-08-18 19:46:57 +02:00
Robin van der Linde
51c00cf4e1
Added tagrenderings and filter 2022-08-18 19:46:37 +02:00
Robin van der Linde
f763a43f0c
Split out layers, added parcel lockers 2022-08-18 19:46:11 +02:00
Robin van der Linde
01315d40e0
Add vehicle=no 2022-08-18 19:43:02 +02:00
Robin van der Linde
8e011d5b35
Merge branch 'develop' into feature/bicycle_road 2022-08-18 19:35:10 +02:00
517b76bb11 Fix #833 2022-08-18 19:29:00 +02:00
05a707d3e0 Rename iconse to include 'mph' as workaround to fix #981 2022-08-18 19:26:59 +02:00
5da76b9418 Rework units to allow picking different default units in different locations, fixes #1011 2022-08-18 19:17:15 +02:00
5129357fa3 Add extra check: don't allow conditions in icon-renderings 2022-08-18 14:39:40 +02:00
89eecdb38a Reorder questions order; add condition to not ask for properties of the tree that can be read from wikidata 2022-08-17 02:42:16 +02:00
1ec2678e49 Rescale hotel svg 2022-08-17 01:28:41 +02:00
483e204321 Split hotels into a new layer 2022-08-17 00:41:12 +02:00
a560eab128
Merge pull request #1026 from pietervdvn/feature/parking-spaces
Add parking spaces layer
2022-08-16 16:43:29 +02:00
Robin van der Linde
619221815a
Merge pull request #1023 from pietervdvn/feature/internet-access
Add questions about internet access
2022-08-15 20:28:28 +02:00
Robin van der Linde
526226c1c0
Changed around icons and question about sign 2022-08-13 21:35:53 +02:00
Robin van der Linde
b499d6470a
Add mappings for bicycle_road and signs 2022-08-13 14:46:45 +02:00
Robin van der Linde
4e54044260
Add mapping for no disabled spaces, fix icon badge 2022-08-13 11:45:01 +02:00
Hopperpop
26c886fb0b
Fix shop softdeletion 2022-08-13 10:33:41 +02:00
Robin van der Linde
412156d90d
Add parking spaces layer 2022-08-11 15:39:53 +02:00
Robin van der Linde
09674f0b2a
Change icon 2022-08-11 13:54:05 +02:00
Robin van der Linde
082ced1b66
Added tagrenderings and filter 2022-08-11 13:42:41 +02:00
Robin van der Linde
573d88af43
Split out layers, added parcel lockers 2022-08-11 12:52:26 +02:00
Robin van der Linde
c1570e401a
Disable shops layer by default 2022-08-10 21:20:09 +02:00
Robin van der Linde
e15ea325e9
Merge branch 'develop' into post-partner 2022-08-10 20:57:23 +02:00
Robin van der Linde
bed18dd948
Remove double braces 2022-08-10 20:51:00 +02:00
Robin van der Linde
95886744a2
Add internet access questions, add to a few themes 2022-08-10 17:29:08 +02:00
eaa5fc012e Disable gps-points from history 2022-08-05 19:51:52 +02:00
5505a896bc Fix translatiosn 2022-08-05 13:15:39 +02:00
247fbd1dac Merge branches 2022-08-05 13:13:32 +02:00
7e1e3c15dc Merge branch 'master' into develop 2022-08-05 13:12:14 +02:00
21aca85515 Add the requirement for all tagRendering-objects to have an ID (including rewrites and multi-builtins) to make translations easier 2022-08-05 13:11:50 +02:00
af60bc566a Housekeeping... 2022-08-05 12:45:51 +02:00
312db3ad50 Add possibility to upload your travelled track to OSM 2022-08-05 12:41:28 +02:00
Arya
e4b9633908
Update hackerspace.json 2022-08-04 23:46:04 +03:00
Robin van der Linde
81e711d6c4
Move label if icon is rendered 2022-08-03 15:14:24 +02:00
Robin van der Linde
e8fa6f3f30
Add more room icons 2022-08-03 14:53:26 +02:00
Robin van der Linde
a6a40d3ac7
Move icon to center 2022-08-03 14:53:06 +02:00
Robin van der Linde
d8fc0c9b49
Switch to single toilets icon 2022-08-03 13:04:20 +02:00
Robin van der Linde
d2901a8a04
Move title to render, add elevators to indoors 2022-08-03 13:03:04 +02:00
Robin van der Linde
2f92bba41a
Added icons for rooms 2022-08-03 13:00:50 +02:00
Robin van der Linde
8334e3429f
Pass all features from indoor layer, remove crest 2022-08-03 12:59:46 +02:00
9424364f3f Merge branch 'develop' into feature/upload-gpx-to-osm 2022-08-02 19:51:00 +02:00
be2816bd0e Merge master 2022-08-02 19:46:16 +02:00
2873359c8f Housekeeping... 2022-07-31 13:33:45 +02:00
Robin van der Linde
7d1eadd128
Add diameters and couplings to hydrants 2022-07-30 22:44:38 +02:00
e4290b4190 Fix faulty svg 2022-07-30 14:50:35 +02:00
917aa771b3 Theme cleanup: fused entrances with indoors 2022-07-30 14:41:02 +02:00
867853b83a New statistics 2022-07-30 14:40:09 +02:00
d5d11d48b5 Merge feature branch 2022-07-29 20:05:55 +02:00
7e32413113 Add 'steal' as special rendering, update 'multi', add entrance overview to onwheels layer 2022-07-29 20:04:36 +02:00
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
6e0247144e Enable data export 2022-07-28 10:52:19 +02:00
9216b5a094 Attempt to fix the build 2022-07-28 10:00:11 +02:00
d68486ae73 Merge branch 'develop' 2022-07-28 09:42:39 +02:00
cfe0a2a64b Translation sync 2022-07-28 09:42:32 +02:00
d01f6ef954 Merge translations 2022-07-28 09:30:58 +02:00
181c5583d2 WIP 2022-07-28 09:16:19 +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
03054f678f Move maproulette layer to the bottom to fix translation generation 2022-07-27 14:47:41 +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
f542ee18cf Move 'indoors' as first level (so it always renders), add feature passthrough 2022-07-27 14:20:55 +02:00
Robin van der Linde
f174a3d776
Merge branch 'develop' into feature/maproulette 2022-07-27 10:25:17 +02:00
e0de707e0a Housekeeping... 2022-07-27 10:18:43 +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
d495078015 Force remove a translation 2022-07-26 17:08:11 +02:00
6cf6e3c6ea Housekeeping... 2022-07-26 16:58:51 +02:00
6d99dd5045 Some tweaks 2022-07-26 16:51:00 +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
7fdd532fdc Fix multilevel question 2022-07-26 12:11:05 +02:00
7812933990 Merge develop 2022-07-26 12:05:02 +02:00
f709eda236 Fix shadowing overrides 2022-07-26 11:52:09 +02:00
512a11740e Fix non-ascii characters, add check for them 2022-07-26 11:38:10 +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
7f1e0965b7
Merge pull request #991 from pietervdvn/feature/onwheels-fixes
added a bunch of stuff (changes in pr)
2022-07-25 19:21:27 +02:00
2412828a69 Extract statistics panel, add statistics panel as special rendering 2022-07-25 18:55:29 +02:00
HispanicMojitos
bcbe7c0ffd added a bunch of stuff (changes in pr) 2022-07-25 17:52:51 +02:00
64d0aac88f Merge branch 'feature/levels' into develop 2022-07-25 16:56:03 +02:00
AlexanderRebai
bd6ed338ae fixed more small things 2022-07-25 14:45:11 +00:00
AlexanderRebai
c7f4628116 added government and indoors layers and changed icons to the new ones 2022-07-25 12:35:21 +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
09e83784c5
Add some more icons 2022-07-24 13:48:37 +02:00