diff --git a/Customizations/Layers/BikeParkings.ts b/Customizations/Layers/BikeParkings.ts deleted file mode 100644 index e934d970e..000000000 --- a/Customizations/Layers/BikeParkings.ts +++ /dev/null @@ -1,17 +0,0 @@ -import {LayerDefinition} from "../LayerDefinition"; -import {Tag} from "../../Logic/Tags"; -import ParkingCapacityCargo from "../Questions/bike/ParkingCapacityCargo"; - - -export default class BikeParkings extends LayerDefinition { - private readonly accessCargoDesignated = new Tag(); - - constructor() { - super(undefined); - this.elementsToShow = [ - new ParkingCapacityCargo().OnlyShowIf(this.accessCargoDesignated) - //new ParkingOperator(), - ]; - - } -} diff --git a/Customizations/Layouts/Cyclofix.ts b/Customizations/Layouts/Cyclofix.ts index 867d6adac..945590d5f 100644 --- a/Customizations/Layouts/Cyclofix.ts +++ b/Customizations/Layouts/Cyclofix.ts @@ -1,5 +1,4 @@ import {Layout} from "../Layout"; -import BikeParkings from "../Layers/BikeParkings"; import BikeServices from "../Layers/BikeStations"; import BikeShops from "../Layers/BikeShops"; import Translations from "../../UI/i18n/Translations"; diff --git a/UI/CustomGenerator/LayerPanel.ts b/UI/CustomGenerator/LayerPanel.ts index d2a68d882..7c0069957 100644 --- a/UI/CustomGenerator/LayerPanel.ts +++ b/UI/CustomGenerator/LayerPanel.ts @@ -87,8 +87,8 @@ export default class LayerPanel extends UIElement { "The minimum zoomlevel needed to load and show this layer."), setting(new DropDown("", [ {value: 0, shown: "Show ways and areas as ways and lines"}, - {value: 1, shown: "Show both the ways/areas and the centerpoints"}, - {value: 2, shown: "Show everything as centerpoint"}]), "wayHandling", "Way handling", + {value: 2, shown: "Show both the ways/areas and the centerpoints"}, + {value: 1, shown: "Show everything as centerpoint"}]), "wayHandling", "Way handling", "Describes how ways and areas are represented on the map: areas can be represented as the area itself, or it can be converted into the centerpoint"), setting(new AndOrTagInput(), "overpassTags", "Overpass query", diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts index 51f1cdf84..e9a6a0379 100644 --- a/UI/i18n/Translations.ts +++ b/UI/i18n/Translations.ts @@ -42,34 +42,7 @@ export default class Translations { "Todas as modificacións que fagas serán gardadas de xeito automático na base de datos global do OpenStreetMap e outros poderán reutilizalos libremente.

" + "Para máis información sobre o proxecto cyclofix, vai a cyclofix.osm.be." }), - parking: { - - type: { - "two-tier": new T(), - }, - operator: { - render: new T({ - en: 'This bike parking is operated by {operator}', - nl: 'Deze fietsparking wordt beheerd door {operator}', - fr: 'Ce parking est opéré par {operator}', - gl: 'Este aparcadoiro de bicicletas está operado por {operator}' - }), - template: new T({en: 'A different operator: $$$', nl: 'Een andere beheerder: $$$', fr: 'TODO: fr'}), - question: new T({ - en: 'Who operates this bike station (name of university, shop, city...)?', - nl: 'Wie beheert deze fietsenparking (naam universiteit, winkel, stad...)?', - fr: 'Qui opére cette station vélo (nom de l\'université, magasin, vile...)', - gl: 'Quen opera este aparcadoiro de bicicletas (nome da universidade, tenda, concello...)?' - }), - private: new T({ - en: 'Operated by a private person', - nl: 'Wordt beheerd door een privépersoon', - fr: 'Opéré par un tier privé', - gl: 'Operado por unha persoa privada' - }), - }, - - }, + station: { name: new T({ en: 'bike station (repair, pump or both)', diff --git a/assets/layers/bike_parking/bike_parking.json b/assets/layers/bike_parking/bike_parking.json index efbecffb1..f87738ca8 100644 --- a/assets/layers/bike_parking/bike_parking.json +++ b/assets/layers/bike_parking/bike_parking.json @@ -14,11 +14,21 @@ }, "icon": "./assets/layers/bike_parking/parking.svg", "size": { - "render": "50,50,bottom" + "render": { + "en": "50,50,bottom" + } }, - "color": "#00f", - "stroke": "4", - "wayHandling": 1, + "color": { + "render": { + "en": "#00f" + } + }, + "width": { + "render": { + "en": "1" + } + }, + "wayHandling": 2, "presets": [ { "title": { diff --git a/assets/layers/bike_parking/handlebar_holder.svg b/assets/layers/bike_parking/handlebar_holder.svg new file mode 100644 index 000000000..0828539cd --- /dev/null +++ b/assets/layers/bike_parking/handlebar_holder.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + diff --git a/assets/layers/bike_parking/rack.svg b/assets/layers/bike_parking/rack.svg new file mode 100644 index 000000000..2af424926 --- /dev/null +++ b/assets/layers/bike_parking/rack.svg @@ -0,0 +1,296 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/bike_parking/shed.svg b/assets/layers/bike_parking/shed.svg new file mode 100644 index 000000000..773239863 --- /dev/null +++ b/assets/layers/bike_parking/shed.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + diff --git a/assets/layers/bike_parking/staple.svg b/assets/layers/bike_parking/staple.svg new file mode 100644 index 000000000..a79c0b2f7 --- /dev/null +++ b/assets/layers/bike_parking/staple.svg @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + diff --git a/assets/layers/bike_parking/two_tier.svg b/assets/layers/bike_parking/two_tier.svg new file mode 100644 index 000000000..f944d0fce --- /dev/null +++ b/assets/layers/bike_parking/two_tier.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/bike_parking/wall_loops.svg b/assets/layers/bike_parking/wall_loops.svg new file mode 100644 index 000000000..e512b3633 --- /dev/null +++ b/assets/layers/bike_parking/wall_loops.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + +