midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge master

Browse source
This commit is contained in:
Pieter Vander Vennet 2021-11-08 17:48:10 +01:00
commit ec09a72cae
14 changed files with 1056 additions and 1089 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Docs/Development_deployment.md
View file

@ -107,8 +107,8 @@ Try removing `node_modules`, `package-lock.json` and `.cache`
Misc setup
----------
The json-git-merger is used to quickly merge translation
files, [documentation here](https://github.com/jonatanpedersen/git-json-merge#single-project--directory)
~~The json-git-merger is used to quickly merge translation files, [documentation here](https://github.com/jonatanpedersen/git-json-merge#single-project--directory).~~
This merge driver is broken and would sometimes drop new questions or duplicate them... Not a good idea!
Overview of package.json-scripts
--------------------------------

2
Models/Constants.ts
View file

@ -2,7 +2,7 @@ import {Utils} from "../Utils";
export default class Constants {
public static vNumber = "0.12.2";
public static vNumber = "0.12.3";
public static ImgurApiKey = '7070e7167f0a25a'
public static readonly mapillary_client_token_v3 = 'TXhLaWthQ1d4RUg0czVxaTVoRjFJZzowNDczNjUzNmIyNTQyYzI2'
public static readonly mapillary_client_token_v4 = "MLY|4441509239301885|b40ad2d3ea105435bd40c7e76993ae85"

2
Models/ThemeConfig/TagRenderingConfig.ts
View file

@ -55,7 +55,7 @@ export default class TagRenderingConfig {
if (typeof json === "number") {
this.render = Translations.WT("" + json)
this.render = Translations.T("" + json, context + ".render")
return;
}

2
UI/i18n/Translations.ts
View file

@ -47,7 +47,7 @@ export default class Translations {
return undefined;
}
if (typeof (s) === "string") {
return new Translation({en: s});
return new Translation({'*': s});
}
if (s instanceof Translation) {
return s.Clone() /* MUST CLONE HERE! */;

3
assets/layers/food/food.json
View file

@ -671,7 +671,8 @@
]
},
"location": [
"point"
"point",
"centroid"
]
}
]

3
assets/layers/observation_tower/observation_tower.json
View file

@ -202,7 +202,8 @@
"render": "40,40,center"
},
"location": [
"point"
"point",
"centroid"
]
}
]

64
assets/layers/parking/parking.json
View file

@ -5,70 +5,29 @@
},
"minzoom": 12,
"source": {
"osmTags": {
"and": [
{
"or": [
"amenity=parking",
"amenity=motorcycle_parking",
"amenity=bicycle_parking"
]
}
]
}
"osmTags": "amenity=parking"
},
"title": {
"render": {
"nl": "Parking"
},
"mappings": [
{
"if": "amenity=parking",
"then": {
"nl": "{name:nl}"
}
},
{
"if": "amenity=motorcycle_parking",
"then": {
"nl": "{name}"
}
},
{
"if": "amenity=bicycle_parking",
"then": {
"nl": "Fietsenstalling"
}
}
]
"nl": "Parking voor auto's",
"en": "Car parking"
}
},
"description": {
"nl": "Parking"
"en": "A layer showing car parkings",
"nl": "Deze laag toont autoparkings"
},
"tagRenderings": [
"images"
],
"presets": [
{
"tags": [
"amenity=bicycle_parking"
],
"title": {
"nl": "fietsparking"
},
"description": {
"nl": "Voeg hier een fietsenstalling toe"
}
},
{
"tags": [
"amenity=parking"
],
"title": {
"nl": "parking"
},
"description": {
"nl": "Voeg hier een parking voor auto's toe"
"nl": "parking voor auto's",
"en": "car parking"
}
}
],
@ -94,8 +53,13 @@
"render": "36,36,center"
},
"location": [
"point"
"point",
"centroid"
]
},
{
"width": 2,
"color": "#ddcc00"
}
]
}

12
assets/layers/play_forest/play_forest.json
View file

@ -106,9 +106,7 @@
],
"mapRendering": [
{
"icon": {
"render": "./assets/layers/play_forest/icon.svg"
},
"icon": "./assets/layers/play_forest/icon.svg",
"iconSize": {
"render": "40,40,center"
},
@ -118,12 +116,8 @@
]
},
{
"color": {
"render": "#007055"
},
"width": {
"render": "2"
}
"color": "#007055",
"width": "2"
}
]
}

12
assets/layers/sport_pitch/sport_pitch.json
View file

@ -506,7 +506,7 @@
"id~node/.*"
]
},
"then": "40,40,center"
"then": "32,32,center"
},
{
"if": "_size_classification=small",
@ -514,13 +514,19 @@
},
{
"if": "_size_classification=large",
"then": "50,50,center"
"then": "40,40,center"
}
]
},
"location": [
"point"
"point",
"centroid"
]
},
{
"color": "#00cc00",
"width": "1",
"fill": "false"
}
]
}

34
assets/layers/toilet/toilet.json
View file

@ -472,23 +472,6 @@
}
],
"filter": [
{
"id": "is_open",
"options": [
{
"question": {
"nl": "Nu geopened",
"en": "Opened now"
},
"osmTags": {
"or": [
"opening_hours=",
"_isOpen=yes"
]
}
}
]
},
{
"id": "wheelchair",
"options": [
@ -533,6 +516,23 @@
}
}
]
},
{
"id": "is_open",
"options": [
{
"question": {
"nl": "Nu geopened",
"en": "Opened now"
},
"osmTags": {
"or": [
"opening_hours=",
"_isOpen=yes"
]
}
}
]
}
],
"deletion": {

9
assets/themes/climbing/climbing.json
View file

@ -224,7 +224,8 @@
"render": "40,40,center"
},
"location": [
"point"
"point",
"centroid"
]
}
]
@ -332,7 +333,8 @@
"render": "40,40,center"
},
"location": [
"point"
"point",
"centroid"
]
}
]
@ -1010,7 +1012,8 @@
{
"icon": "./assets/themes/climbing/climbing_unknown.svg",
"location": [
"point"
"point",
"centroid"
]
},
{

1933
css/index-tailwind-output.css
View file

File diff suppressed because it is too large Load diff

27
langs/layers/en.json
View file

@ -2443,6 +2443,17 @@
}
}
},
"parking": {
"description": "A layer showing car parkings",
"presets": {
"0": {
"title": "car parking"
}
},
"title": {
"render": "Car parking"
}
},
"picnic_table": {
"description": "The layer showing picnic tables",
"name": "Picnic tables",
@ -3219,6 +3230,14 @@
}
},
"tagRenderings": {
"Opening-hours": {
"mappings": {
"0": {
"then": "Opened 24/7"
}
},
"question": "When are these toilets opened?"
},
"toilet-access": {
"mappings": {
"0": {
@ -3333,14 +3352,6 @@
}
},
"question": "Is there a dedicated toilet for wheelchair users"
},
"Opening-hours": {
"mappings": {
"0": {
"then": "Opened 24/7"
}
},
"question": "When are these toilets opened?"
}
},
"title": {

38
langs/layers/nl.json
View file

@ -2756,31 +2756,15 @@
}
},
"parking": {
"description": "Parking",
"description": "Deze laag toont autoparkings",
"name": "Parking",
"presets": {
"0": {
"description": "Voeg hier een fietsenstalling toe",
"title": "fietsparking"
},
"1": {
"description": "Voeg hier een parking voor auto's toe",
"title": "parking"
"title": "parking voor auto's"
}
},
"title": {
"mappings": {
"0": {
"then": "{name:nl}"
},
"1": {
"then": "{name}"
},
"2": {
"then": "Fietsenstalling"
}
},
"render": "Parking"
"render": "Parking voor auto's"
}
},
"picnic_table": {
@ -3604,6 +3588,14 @@
}
},
"tagRenderings": {
"Opening-hours": {
"mappings": {
"0": {
"then": "Altijd open"
}
},
"question": "Wanneer zijn deze toiletten open?"
},
"toilet-access": {
"mappings": {
"0": {
@ -3718,14 +3710,6 @@
}
},
"question": "Is er een rolstoeltoegankelijke toilet voorzien?"
},
"Opening-hours": {
"mappings": {
"0": {
"then": "Altijd open"
}
},
"question": "Wanneer zijn deze toiletten open?"
}
},
"title": {