closes #267, closes #266

app/components/ors-header/ors-header.js

@@ -84,11 +84,8 @@ angular.module("orsApp.ors-header", []).component("orsHeader", {
        */
       ctrl.setDefaultValues = value => {
         angular.forEach(Object.keys(ctrl.currentOptions.env), key => {
-          let pre = ctrl.currentOptions.env[key].split("/")
-          ctrl.currentOptions.env[key] = [
-            value,
-            pre[pre.length - 1]
-          ].join("/");
+          let pre = ctrl.currentOptions.env[key].split("/");
+          ctrl.currentOptions.env[key] = [value, pre[pre.length - 1]].join("/");
         });
       };
       /**

app/components/ors-panel-accessibilityanalysis/ors-aa-queries/ors-aa-queries.js

@@ -41,7 +41,7 @@ angular
           orsAaService.toggle(obj.isoidx, obj.toggle, obj.zoom);
         };
         ctrl.toggleInterval = obj => {
-          orsAaService.toggleInterval(obj.isoidx, obj.revIsoIidx, obj.toggle)
+          orsAaService.toggleInterval(obj.isoidx, obj.revIsoIidx, obj.toggle);
         };
         ctrl.removeQuery = isoidx => {
           orsAaService.remove(isoidx);

app/constants/mappings.js

@@ -438,5 +438,35 @@ angular.module("orsApp").constant("mappings", {
       text: ">S5",
       color: "#132020"
     }
+  },
+  roadaccessrestrictions: {
+    "0": {
+      text: "None (there are no restrictions)",
+      color: "#fe7f6c"
+    },
+    "1": {
+      text: "No",
+      color: "#FE7F9C"
+    },
+    "2": {
+      text: "Customers",
+      color: "#FDAB9F"
+    },
+    "4": {
+      text: "Destination",
+      color: "#FF66CC"
+    },
+    "8": {
+      text: "Delivery",
+      color: "#FDB9C8"
+    },
+    "16": {
+      text: "Private",
+      color: "#F64A8A"
+    },
+    "32": {
+      text: "Permissive",
+      color: "#E0115F"
+    }
   }
 });

app/includes/info.html

@@ -43,8 +43,10 @@ <h4 ng-bind-html="'Software & Libraries'">
     </p>
     <p class="textjustify" ng-bind-html="('INFO_III' | translate)">
     </p>
-     <p class="info" ng-bind-html="('INFO_II_I' | translate)"></p>
-     <p ng-bind-html="('INFO_II_II' | translate)"></p>
+     <p class="textjustify" ng-bind-html="('INFO_VI' | translate)">
+    </p>
+    <p class="info" ng-bind-html="('INFO_II_I' | translate)"></p>
+    <p ng-bind-html="('INFO_II_II' | translate)"></p>
 </section>
 <div class="ui divider">
 </div>

app/infrastructure/ors-utils-service.js

@@ -349,7 +349,6 @@ angular.module("orsApp.utils-service", []).factory("orsUtilsService", [
       if (settings.profile.options.maxspeed)
         options.maximum_speed = settings.profile.options.maxspeed.toString();
       if (subgroup === "Bicycle") {
-        console.log(settings.profile.options);
         if (
           (settings.profile.options.steepness > 0) &
           (settings.profile.options.steepness <= 15)

app/languages/de-DE.json

@@ -146,6 +146,7 @@
     "steepness": "Steigung",
     "waytypes": "Wegtypen",
     "surface": "Oberflächenbeschaffenheit",
+    "roadaccessrestrictions": "Straßen Beschränkungen",
     "green": "Grünflächen index (Eingeschränkt auf Deutschland)",
     "tollways": "Mautstraßen",
     "FROM": "from",
@@ -164,6 +165,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Es ist Nutzern untersagt, ohne ausdrückliche schriftliche Genehmigung des CIAT einen kommerziellen, nicht-freien Weiterverkauf oder eine Weiterverbreitung durchzuführen. Originaldaten von Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Lückenlose V4 SRTM-Daten, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "Falls Sie weitere Fragen, Anliegen oder Feedback für uns haben, kontaktieren Sie uns bitte über unser Forum:",
     "INFO_V": "Openrouteservice nimmt sich Zeit für Ihre Anfragen, Probleme, Fragen etc. Wir legen großen Wert darauf Ihnen so schnell wie möglich zu antworten. Nachdem Sie unsere automatische E-Mail erhalten die Ihnen bestätigt, dass wir Ihre Anfrage erhalten haben, werden wir uns bald mit Ihnen in Verbindung setzen. Bitte geben Sie uns etwas Zeit ihre Anfrage zu bearbeiten, da wir sehr viele Anfragen erhalten.",
+    "INFO_VI": "Bevölkerungszahlen sind anhand des <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a> berechnet.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Isochronen generieren",
     "DETOUR_FACTOR": "Umwegfaktor",

app/languages/en-GB.json

@@ -146,6 +146,7 @@
     "steepness": "Steepness",
     "waytypes": "Way types",
     "surface": "Surfaces",
+    "roadaccessrestrictions": "Road access restrictions",
     "green": "Green index (for Germany only)",
     "FROM": "from",
     "TO": "to",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Users are prohibited from any commercial, non-free resale, or redistribution without explicit written permission from CIAT. Original data by Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Hole-filled seamless SRTM data V4, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "In case you have any further questions, concerns or feedback, please contact us via:",
     "INFO_V": "Openrouteservice cares about your inquiries, problems, questions etc. As there will always be a stream of inquiries, we take strong responsibility to respond to you in short time. After you have received our automatic response email to let you know we have received your inquiry, we will usually respond shortly. Please give us time to look into your reported issue properly before getting back.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Generate isochrones",
     "DETOUR_FACTOR": "Detour factor",

app/languages/en-US.json

@@ -55,7 +55,7 @@
     "SURFACE": "Surface",
     "INCLINE": "Incline",
     "CURB": "Curb",
-    "ISOCHRONES": "Isochrones",
+    "ISOCHRONES": "Isochroƒnes",
     "ISOCHRONEMETHOD": "Isochrone method",
     "TIMEDISTANCE": "Time",
     "ISOCHRONEINTERVAL": "Interval",
@@ -146,6 +146,7 @@
     "steepness": "Steepness",
     "waytypes": "Way types",
     "surface": "Surfaces",
+    "roadaccessrestrictions": "Road access restrictions",
     "green": "Green index (for Germany only)",
     "tollways": "Tollways",
     "FROM": "from",
@@ -164,6 +165,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Users are prohibited from any commercial, non-free resale, or redistribution without explicit written permission from CIAT. Original data by Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Hole-filled seamless SRTM data V4, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "In case you have any further questions, concerns or feedback, please contact us via:",
     "INFO_V": "Openrouteservice cares about your inquiries, problems, questions etc. As there will always be a stream of inquiries, we take strong responsibility to respond to you in short time. After you have received our automatic response email to let you know we have received your inquiry, we will usually respond shortly. Please give us time to look into your reported issue properly before getting back.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Generate isochrones",
     "DETOUR_FACTOR": "Detour factor",

app/languages/es-ES.json

@@ -146,6 +146,7 @@
     "steepness": "Inclinación",
     "waytypes": "Tipos de camino",
     "surface": "Superficie",
+    "roadaccessrestrictions": "Camino restricción",
     "green": "Green index (for Germany only)",
     "tollways": "Tollways",
     "FROM": "desde",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Users are prohibited from any commercial, non-free resale, or redistribution without explicit written permission from CIAT. Original data by Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Hole-filled seamless SRTM data V4, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "In case you have any further questions, concerns or feedback, please contact us via:",
     "INFO_V": "Openrouteservice cares about your inquiries, problems, questions etc. As there will always be a stream of inquiries, we take strong responsibility to respond to you in short time. After you have received our automatic response email to let you know we have received your inquiry, we will usually respond shortly. Please give us time to look into your reported issue properly before getting back.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Generate isochrones",
     "DETOUR_FACTOR": "Detour factor",

app/languages/fr-FR.json

@@ -146,6 +146,7 @@
     "steepness": "Pente",
     "waytypes": "Types de voie",
     "surface": "Surfaces",
+    "roadaccessrestrictions": "Rue limitation",
     "green": "Green index (for Germany only)",
     "tollways": "Tollways",
     "FROM": "depuis",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Il est interdit aux utilisateurs de toute revente commerciale ou non-libre, ou de toute redistribution sans autorisation écrite explicite de CIAT.. Données originales par Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Données SRTM V4 sans soudure remplies de trous, Centro Internacional de Agricultura Tropical (CIAT)",
     "INFO_IV": "Dans le cas où vous avez d'autres questions, problèmes ou remarques, veuillez nous contacter via:",
     "INFO_V": "Openrouteservice s'occupe de vos demandes de renseignements, problèmes, questions etc. Comme il y aura toujours un flot de demande de rensignements, nous prenons la responsabilité de vous répondre le plus vite possible. Après que vous ayez reçu notre email de réponse automatique pour vous indiquer que nous avons bien reçu votre demande, nous répondrons généralemment rapidement. Veuillez s'il-vous-plaît nous laisser le temps de regarder votre problème correctement avant de revenir vers vous.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "AJouter à la carte",
     "GENERATE_ISOCHRONES": "Générer les isochrones",
     "DETOUR_FACTOR": "Facteur de détour",

app/languages/it-IT.json

@@ -146,6 +146,7 @@
     "steepness": "Ripidezza",
     "waytypes": "Tipi di strade",
     "surface": "Superfici",
+    "roadaccessrestrictions": "Via limitazione",
     "green": "Indice di verde (solo in Germania)",
     "tollways": "Strade a pedaggio",
     "FROM": "da",
@@ -164,6 +165,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Agli utenti è vietata qualsiasi rivendita o ridistribuzione commerciale non libera senza esplicita autorizzazione scritta di CIAT. Dati originali di Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Dati SRTM V4 senza fori pieni di fori, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "Se hai qualsiasi ulteriore dubbio, preoccupazione o consiglio, per favore contattaci tramit:",
     "INFO_V": "Openrouteservice è interessato ai tuoi dubbi, problemi domande ecc. In quanto ci sarà sempre un flusso di dubbi noi prendiamo molto seriamente la responsabilità di rispondere nel più breve tempo possibile. Dopo aver ricevuto una risposta email automatica per farvi sapere che abbiamo ricevuto la vostra richiesta, solitamente rispondiamo dopo breve tempo. Per piacere dateci il tempo di controllare la vostra segnalazione in maniera apropriata prima di ricontattarvi.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Aggiungi alla mappa",
     "GENERATE_ISOCHRONES": "Genera isocrone",
     "DETOUR_FACTOR": "Fattore di deviazione",

app/languages/pl-PL.json

@@ -146,6 +146,7 @@
     "steepness": "Nachylenie",
     "waytypes": "Typy dróg",
     "surface": "Nawierzchnie",
+    "roadaccessrestrictions": "Ograniczenie ulica",
     "green": "Green index (for Germany only)",
     "tollways": "Tollways",
     "FROM": "od",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Users are prohibited from any commercial, non-free resale, or redistribution without explicit written permission from CIAT. Original data by Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Hole-filled seamless SRTM data V4, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "In case you have any further questions, concerns or feedback, please contact us via:",
     "INFO_V": "Openrouteservice cares about your inquiries, problems, questions etc. As there will always be a stream of inquiries, we take strong responsibility to respond to you in short time. After you have received our automatic response email to let you know we have received your inquiry, we will usually respond shortly. Please give us time to look into your reported issue properly before getting back.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Generate isochrones",
     "DETOUR_FACTOR": "Detour factor",

app/languages/pt-PT.json

@@ -146,6 +146,7 @@
     "steepness": "Inclinação",
     "waytypes": "Tipos de caminho",
     "surface": "Superfícies",
+    "roadaccessrestrictions": "Rua limite",
     "green": "Índice ecológico",
     "tollways": "Portagens",
     "FROM": "de",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Os usuários estão proibidos de qualquer revenda comercial ou não gratuita ou redistribuição sem permissão explícita por escrito do CIAT. Dados originais de Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Dados SRTM V4 sem costura preenchidos com buracos, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "Caso tenha mais questões, preocupações ou comentários a fazer, contacte-nos através de:",
     "INFO_V": "A equipa do Openrouteservice da importância aos seus inquéritos, problemas, questões, etc. Embora haja grande afluência de inquéritos provenientes de utilizadores do nosso serviço, tentaremos entrar em contacto consigo o mais rapidamente possível, após receber a nossa resposta automática via e-mail. Por favor, dê-nos algum tempo para analisar o seu problema em detalhe.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Adicionar ao mapa",
     "GENERATE_ISOCHRONES": "Gerar linhas Isocronas",
     "DETOUR_FACTOR": "Factor de atalho",

app/languages/ru-RU.json

@@ -146,6 +146,7 @@
     "steepness": "Крутизна",
     "waytypes": "Типы дорог",
     "surface": "Типы покрытия",
+    "roadaccessrestrictions": "улица ограничение",
     "green": "Green index (for Germany only)",
     "tollways": "Tollways",
     "FROM": "из",
@@ -163,6 +164,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. Users are prohibited from any commercial, non-free resale, or redistribution without explicit written permission from CIAT. Original data by Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008, Hole-filled seamless SRTM data V4, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "In case you have any further questions, concerns or feedback, please contact us via:",
     "INFO_V": "Openrouteservice cares about your inquiries, problems, questions etc. As there will always be a stream of inquiries, we take strong responsibility to respond to you in short time. After you have received our automatic response email to let you know we have received your inquiry, we will usually respond shortly. Please give us time to look into your reported issue properly before getting back.",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "Add to map",
     "GENERATE_ISOCHRONES": "Generate isochrones",
     "DETOUR_FACTOR": "Detour factor",

app/languages/zh-CN.json

@@ -146,6 +146,7 @@
     "steepness": "陡峭程度",
     "waytypes": "道路类型",
     "surface": "路面类型",
+    "roadaccessrestrictions": "Road access restrictions",
     "green": "绿化程度 (for Germany only)",
     "tollways": "Tollways",
     "noise": "噪声强度 (for Germany only)",
@@ -164,6 +165,7 @@
     "INFO_III": "Hillshade Layer: <a class='link' href='http://srtm.csi.cgiar.org' target='_blank'>CIAT-CSI SRTM</a>. 未经CIAT明确书面许可，禁止用户进行任何商业，非自由转售或重新分配. Jarvis A., H.I. Reuter, A. Nelson, E. Guevara, 2008 的原始数据, 填充无缝SRTM V4数据, International Centre for Tropical Agriculture (CIAT)",
     "INFO_IV": "如果您有任何进一步的问题、咨询或反馈，请联系我们：",
     "INFO_V": "Openrouteservice非常重视用户提出的任何问题、建议、咨询和反馈。尽管咨询数量很多，但我们仍然会努力尽快回复。如果您在给我们发送了问题或咨询之后收到了自动确认邮件，我们通常会随后很快给您答复。在此期间，请您暂时耐心等待。",
+    "INFO_VI": "Population data provided by <a class='link' href='https://ghsl.jrc.ec.europa.eu/about.php' target='_blank'>The Global Human Settlement (GHS) frameworks</a>.",
     "ADD_EXTRAS": "添加至地图",
     "GENERATE_ISOCHRONES": "生成等值线",
     "DETOUR_FACTOR": "绕道指数",