Merge pull request #3311 from ProjectSidewalk/develop

v7.15.3

app/views/userProfile.scala.html

@@ -99,7 +99,7 @@
         }
 
         <div class="row" id="achievements">
-            <h2>@Messages("dashboard.achievements")</h2>
+            <h2 id="achievements">@Messages("dashboard.achievements")</h2>
             <!-- The achievements-outer-grid is 3 columns -->
             <div class="achievements-outer-grid">
                 <div class="achievements-outer-col1">
@@ -161,7 +161,7 @@ <h3>@Messages("validations")</h3>
         </div>
 
         <div id="mistakes-row" class="row">
-            <h2>@Messages("dashboard.mistakes.header")</h2>
+            <h2 id="recent-mistakes">@Messages("dashboard.mistakes.header")</h2>
             <span id="mistakes-subheader-display"></span>
             <img src="@routes.Assets.at("images/icons/QuestionMark.png")" class="mistakes-help-tooltip" data-toggle="tooltip" data-placement="top" title="@Messages("dashboard.mistakes.tooltip")" alt="">
             <div id="mistake-carousels-holder"></div>

build.sbt

@@ -2,7 +2,7 @@ import play.PlayScala
 
 name := """sidewalk-webpage"""
 
-version := "7.15.2"
+version := "7.15.3"
 
 scalaVersion := "2.10.7"
 

conf/cityparams.conf

@@ -438,9 +438,9 @@ city-params {
     oradell-nj = 40.955
     validation-study = ${city-params.city-center-lat.seattle-wa}
     zurich = 47.373
-    taipei = 25.036
-    new-taipei-tw = ${city-params.city-center-lat.taipei}
-    keelung-tw = ${city-params.city-center-lat.taipei}
+    taipei = 25.060
+    new-taipei-tw = 25.036
+    keelung-tw = 25.112
     auckland = -36.958
     cuenca = -2.898
     crowdstudy = ${city-params.city-center-lat.seattle-wa}
@@ -460,8 +460,8 @@ city-params {
     validation-study = ${city-params.city-center-lng.seattle-wa}
     zurich = 8.542
     taipei = 121.536
-    new-taipei-tw = ${city-params.city-center-lng.taipei}
-    keelung-tw = ${city-params.city-center-lng.taipei}
+    new-taipei-tw = 121.550
+    keelung-tw = 121.730
     auckland = 174.765458
     cuenca = -79.005
     crowdstudy = ${city-params.city-center-lng.seattle-wa}
@@ -585,9 +585,9 @@ city-params {
     oradell-nj = 14.5
     validation-study = 12.0
     zurich = 15.0
-    taipei = 14.25
-    new-taipei-tw = ${city-params.default-map-zoom.taipei}
-    keelung-tw = ${city-params.default-map-zoom.taipei}
+    taipei = 13.0
+    new-taipei-tw = 13.0
+    keelung-tw = 13.25
     auckland = 12.0
     cuenca = 15.75
     crowdstudy = 11.75

conf/evolutions/default/195.sql

@@ -0,0 +1,5 @@
+# --- !Ups
+INSERT INTO version VALUES ('7.15.3', now(), 'Maps in Taiwan now point to revealed villages.');
+
+# --- !Downs
+DELETE FROM version WHERE version_id = '7.15.3';

conf/messages.de

@@ -321,7 +321,7 @@ leaderboard.tooltip.accuracy = Die Genauigkeit wird nur angezeigt, wenn mindeste
 leaderboard.tooltip.weekly.reset = Die Statistik wird jeden Sonntag Morgen um 0:00 Uhr PT zurückgesetzt.
 leaderboard.encouragement = Wollen Sie es unter die Top 10 schaffen? <a id="encouragement-link" href="/explore"><u>Erkundung starten!</u></a>
 leaderboard.encouragement.no.user = <a id="encouragement-link" href="/signUp"><u>Registrieren</u></a> Sie sich, um Ihren Fortschritt zu verfolgen!
-leaderboard.encouragement.no.org = <a id="encouragement-link" href="/dashboard"><u>Treten Sie einer Organisation bei</u></a> und arbeiten Sie im Team zusammen, um Gehwege zu kartieren und zu bewerten!
+leaderboard.encouragement.no.org = Möchten Sie Ihre Genauigkeit verbessern? Lesen Sie unseren <a id="encouragement-link" href="/labelingGuide"><u>Etikettierungsleitfaden</u></a> und sehen Sie sich Ihre letzten falschen Etiketten auf <a id="encouragement-link" href="/dashboard#recent-mistakes"><u>Ihrem Dashboard</u></a> an
 
 gallery = Galerie
 gallery.show = Anzeigen

conf/messages.en

@@ -321,7 +321,7 @@ leaderboard.tooltip.accuracy = Accuracy is only shown if at least 10 of your lab
 leaderboard.tooltip.weekly.reset = Stats reset every Sunday morning at 12 AM Pacific
 leaderboard.encouragement = Want to make it into the Top 10? <a id="encouragement-link" href="/explore"><u>Start exploring!</u></a>
 leaderboard.encouragement.no.user = <a id="encouragement-link" href="/signUp"><u>Sign up</u></a> to track your progress!
-leaderboard.encouragement.no.org = <a id="encouragement-link" href="/dashboard"><u>Join an organization</u></a> and work together as a team to map and assess sidewalks!
+leaderboard.encouragement.no.org = Want to improve your accuracy? Read our <a id="encouragement-link" href="/labelingGuide"><u>labeling guide</u></a> and view your recent incorrect labels on <a id="encouragement-link" href="/dashboard#recent-mistakes"><u>your dashboard</u></a>
 
 gallery = Gallery
 gallery.show = Show

conf/messages.en-NZ

@@ -43,5 +43,3 @@ dashboard.no.org = No Organisation
 dashboard.edit.info = If you don''t see your organisation, please email <a id="email-link" href="mailto:sidewalk@cs.uw.edu" target="_blank">sidewalk@cs.uw.edu</a> and include your organisation name and description.
 dashboard.orgs.unavailable = There are no available organisations!
 dashboard.leave.org = Leave Organisation
-
-leaderboard.encouragement.no.org = <a id="encouragement-link" href="/dashboard"><u>Join an organisation</u></a> and work together as a team to map and assess footpaths!

conf/messages.es

@@ -319,7 +319,7 @@ leaderboard.tooltip.accuracy = La precisión sólo se muestra si al menos 10 de
 leaderboard.tooltip.weekly.reset = Las estadísticas se restablecen todos los domingos por la mañana a las 12:00 a.m. (PT)
 leaderboard.encouragement = ¿Quieres entrar en el Top 10? <a id="encouragement-link" href="/explore"><u>¡Empieza a explorar!</u></a>
 leaderboard.encouragement.no.user = ¡<a id="encouragement-link" href="/signUp"><u>Regístrate</u></a> para seguir tu progreso!
-leaderboard.encouragement.no.org = ¡<a id="encouragement-link" href="/dashboard"><u>Únase a una organización</u></a> y trabaje en equipo para mapear y evaluar las aceras!
+leaderboard.encouragement.no.org = ¿Quieres mejorar tu precisión? Lea nuestra <a id="encouragement-link" href="/labelingGuide"><u>guía de etiquetado</u></a> y vea sus etiquetas incorrectas recientes en <a id="encouragement-link" href="/dashboard#recent-mistakes"><u>su tablero</u></a>
 
 gallery = Galería
 gallery.show = Mostrar

conf/messages.nl

@@ -319,7 +319,7 @@ leaderboard.tooltip.accuracy = Nauwkeurigheid wordt alleen weergegeven als ten m
 leaderboard.tooltip.weekly.reset = Statistieken worden elke zondagochtend om 12.00 uur Pacific Time gereset
 leaderboard.encouragement = Wil je in de Top 10 komen? <a id="encouragement-link" href="/explore"><u>Begin met verkennen!</u></a>
 leaderboard.encouragement.no.user = <a id="encouragement-link" href="/signUp"><u>Meld je aan</u></a> om je voortgang bij te houden!
-leaderboard.encouragement.no.org = <a id="encouragement-link" href="/dashboard"><u>Sluit je aan bij een organisatie</u></a> en werk samen als een team om trottoirs in kaart te brengen en te beoordelen!
+leaderboard.encouragement.no.org = Wilt u uw nauwkeurigheid verbeteren? Lees onze <a id="encouragement-link" href="/labelingGuide"><u>labelgids</u></a> en bekijk uw recente onjuiste labels op <a id="encouragement-link" href="/dashboard#recent-mistakes"><u>uw dashboard</u></a>
 
 gallery = Galerij
 gallery.show = Tonen

conf/messages.zh

@@ -321,7 +321,7 @@ leaderboard.tooltip.accuracy = 僅當至少您的10個標記獲得檢核時才
 leaderboard.tooltip.weekly.reset = 每週日上午12點重置統計數據
 leaderboard.encouragement = 想進入排行榜前10嗎？ <a id="encouragement-link" href="/explore"><u>開始探索地圖吧！</u></a>
 leaderboard.encouragement.no.user = <a id="encouragement-link" href="/signUp"><u>註冊</u></a>以開始追蹤您的參與進度！
-leaderboard.encouragement.no.org = <a id="encouragement-link" href="/dashboard"><u>加入一個組織</u></a>就可與您的隊友競賽！
+leaderboard.encouragement.no.org = 想提高你的準確性嗎？閱讀我們的<a id="encouragement-link" href="/labelingGuide"><u>標籤指南</u></a>並在<a id="encouragement-link" href="/dashboard#recent-mistakes"><u>儀表板</u></a>上查看最近的錯誤標籤
 
 gallery = 標記彙整
 gallery.show = 顯示項目

package.json

@@ -1,19 +1,19 @@
 {
-  "devDependencies": {
-    "eslint": "^7.26.0",
-    "grunt": "^1.4.0",
-    "grunt-concat-css": "*",
-    "grunt-contrib-concat": "*",
-    "grunt-contrib-watch": "*",
-    "htmlhint": "^0.14.2",
-    "stylelint": "^13.13.1",
-    "stylelint-config-standard": "^22.0.0"
-  },
-  "scripts": {
-    "grunt-concat": "grunt concat && grunt concat_css",
-    "build": "npm install && grunt",
-    "debug": "npm run grunt-concat && grunt watch & sbt -jvm-debug 9998 run",
-    "start": "npm run grunt-concat && grunt watch & sbt -Dsbt.ivy.home='.ivy2' -Dsbt.global.base='.sbt' -Dsbt.repository.config='.sbt/repositories' -mem 12288 compile \"~ run\" shell",
-    "test": "grunt && grunt test"
-  }
+    "devDependencies": {
+        "eslint": "^7.26.0",
+        "grunt": "^1.4.0",
+        "grunt-concat-css": "*",
+        "grunt-contrib-concat": "*",
+        "grunt-contrib-watch": "*",
+        "htmlhint": "^0.14.2",
+        "stylelint": "^13.13.1",
+        "stylelint-config-standard": "^22.0.0"
+    },
+    "scripts": {
+        "grunt-concat": "grunt concat && grunt concat_css",
+        "build": "npm install && grunt",
+        "debug": "npm run grunt-concat && grunt watch & sbt -jvm-debug 9998 run",
+        "start": "npm run grunt-concat && grunt watch & sbt -Dsbt.ivy.home='.ivy2' -Dsbt.global.base='.sbt' -Dsbt.repository.config='.sbt/repositories' -mem 12288 compile \"~ run\" shell",
+        "test": "grunt && grunt test"
+    }
 }

public/javascripts/SVLabel/src/SVLabel/keyboard/Keyboard.js

@@ -250,12 +250,7 @@ function Keyboard (svl, canvas, contextMenu, googleMap, ribbon, zoomControl) {
                     break;
                 case 27:
                     // "Escape"
-                    if (contextMenu.isOpen()) {
-                        svl.tracker.push("KeyboardShortcut_CloseContextMenu");
-                        svl.tracker.push("ContextMenu_CloseKeyboardShortcut");
-                        contextMenu.hide();
-                    }
-
+                    _closeContextMenu(e.keyCode);
                     ribbon.backToWalk();
                     break;
             }

public/javascripts/common/MissionStartTutorial.js

@@ -853,21 +853,21 @@ function MissionStartTutorial(missionType, labelType, data, svvOrsvl) {
         }
 
         $('.mst-instruction-1').html(labelTypeModule.missionInstruction1); // Explore mission screens have HTML in strings.
-        $('.mst-instruction-2').text(labelTypeModule.missionInstruction2);
+        $('.mst-instruction-2').html(labelTypeModule.missionInstruction2);
 
         $('.mission-start-tutorial-done-btn').text(i18next.t('common:mission-start-tutorial.start-mission'));
 
         // Show the tab bar to allow selection of different labels in explore mission screens.
         // And set up other UI.
         if (missionType === MISSION_TYPES.EXPLORE) {
 
-            $('.explore-mission-start-tab.label[data-label-type="CurbRamp"]').find('.explore-mission-start-tab-text').text(i18next.t('common:curb-ramp'));
-            $('.explore-mission-start-tab.label[data-label-type="NoCurbRamp"]').find('.explore-mission-start-tab-text').text(i18next.t('common:no-curb-ramp'));
-            $('.explore-mission-start-tab.label[data-label-type="Obstacle"]').find('.explore-mission-start-tab-text').text(i18next.t('common:obstacle'));
-            $('.explore-mission-start-tab.label[data-label-type="SurfaceProblem"]').find('.explore-mission-start-tab-text').text(i18next.t('common:surface-problem'));
-            $('.explore-mission-start-tab.label[data-label-type="NoSideWalk"]').find('.explore-mission-start-tab-text').text(i18next.t('common:no-sidewalk'));
-            $('.explore-mission-start-tab.label[data-label-type="Crosswalk"]').find('.explore-mission-start-tab-text').text(i18next.t('common:crosswalk'));
-            $('.explore-mission-start-tab.label[data-label-type="Signal"]').find('.explore-mission-start-tab-text').text(i18next.t('common:signal'));
+            $('.explore-mission-start-tab.label[data-label-type="CurbRamp"]').find('.explore-mission-start-tab-text').html(i18next.t('common:curb-ramp'));
+            $('.explore-mission-start-tab.label[data-label-type="NoCurbRamp"]').find('.explore-mission-start-tab-text').html(i18next.t('common:no-curb-ramp'));
+            $('.explore-mission-start-tab.label[data-label-type="Obstacle"]').find('.explore-mission-start-tab-text').html(i18next.t('common:obstacle'));
+            $('.explore-mission-start-tab.label[data-label-type="SurfaceProblem"]').find('.explore-mission-start-tab-text').html(i18next.t('common:surface-problem'));
+            $('.explore-mission-start-tab.label[data-label-type="NoSideWalk"]').find('.explore-mission-start-tab-text').html(i18next.t('common:no-sidewalk'));
+            $('.explore-mission-start-tab.label[data-label-type="Crosswalk"]').find('.explore-mission-start-tab-text').html(i18next.t('common:crosswalk'));
+            $('.explore-mission-start-tab.label[data-label-type="Signal"]').find('.explore-mission-start-tab-text').html(i18next.t('common:signal'));
 
             $('.explore-mission-start-tab-bar').show();