Merge pull request #3688 from ProjectSidewalk/develop

v7.20.8

Gruntfile.js

@@ -91,7 +91,7 @@ module.exports = function(grunt) {
                     'public/javascripts/Gallery/src/keyboard/*.js',
                     'public/javascripts/Gallery/src/validation/*.js',
                     'public/javascripts/Gallery/src/displays/*.js',
-                    'public/javascripts/Gallery/src/modal/*.js',
+                    'public/javascripts/Gallery/src/expandedview/*.js',
                     'public/javascripts/Gallery/src/*.js',
                     'public/javascripts/common/Panomarker.js',
                     'public/javascripts/common/GSVInfoPopover.js'

app/models/daos/slick/UserDAOSlick.scala

@@ -493,7 +493,7 @@ object UserDAOSlick {
 
     // Map(user_id: String -> (most_recent_sign_in_time: Option[Timestamp], sign_in_count: Int)).
     val signInTimesAndCounts =
-      WebpageActivityTable.activities.filter(_.activity inSet List("AnonAutoSignUp", "SignIn"))
+      WebpageActivityTable.activities.filter(row => row.activity === "AnonAutoSignUp" || (row.activity like "SignIn%"))
         .groupBy(_.userId).map{ case (_userId, group) => (_userId, group.map(_.timestamp).max, group.length) }
         .list.map{ case (_userId, _time, _count) => (_userId, (_time, _count)) }.toMap
 

app/models/user/WebpageActivityTable.scala

@@ -46,7 +46,7 @@ object WebpageActivityTable {
     */
   def selectAllSignInCounts: List[(String, String, Int)] = db.withTransaction { implicit session =>
     val signIns = for {
-      _activity <- activities if _activity.activity === "SignIn"
+      _activity <- activities if _activity.activity like "SignIn%"
       _userRole <- userRoles if _activity.userId === _userRole.userId
       _role <- roles if _userRole.roleId === _role.roleId
       if _role.role =!= "Anonymous"

app/views/gallery.scala.html

@@ -79,25 +79,25 @@ <h5 id="validation-options-header" class="filter-subheader">@Messages("validatio
         </div>
         <div id="gallery-content" class="grid-container">
             <div id="image-card-container" class="cards"></div>
-            <div class="gallery-modal">
-                <div class="modal-top-holder">
-                    <div class="gallery-modal-header"></div>
-                    <div class="gallery-modal-close">×</div>
+            <div class="gallery-expanded-view">
+                <div class="expanded-view-top-holder">
+                    <div class="gallery-expanded-view-header"></div>
+                    <div class="gallery-expanded-view-close">×</div>
                 </div>
-                <div class="gallery-modal-pano">
-                    <button class="gallery-modal-pano-paging" id="prev-label">&lt</button>
-                    <div class="gallery-modal-pano-display">
+                <div class="gallery-expanded-view-pano">
+                    <button class="gallery-expanded-view-pano-paging" id="prev-label">&lt</button>
+                    <div class="gallery-expanded-view-pano-display">
                         <div class="actual-pano"></div>
                     </div>
-                    <button class="gallery-modal-pano-paging" id="next-label">&gt</button>
+                    <button class="gallery-expanded-view-pano-paging" id="next-label">&gt</button>
                 </div>
-                <div class="gallery-modal-info">
-                    <div class="gallery-modal-info-timestamps"></div>
-                    <div class="gallery-modal-info-severity"></div>
-                    <div class="gallery-modal-info-validation"></div>
-                    <div class="gallery-modal-info-tags"></div>
-                    <div class="gallery-modal-info-temporary"></div>
-                    <div class="gallery-modal-info-description"></div>
+                <div class="gallery-expanded-view-info">
+                    <div class="gallery-expanded-view-info-timestamps"></div>
+                    <div class="gallery-expanded-view-info-severity"></div>
+                    <div class="gallery-expanded-view-info-validation"></div>
+                    <div class="gallery-expanded-view-info-tags"></div>
+                    <div class="gallery-expanded-view-info-temporary"></div>
+                    <div class="gallery-expanded-view-info-description"></div>
                 </div>
             </div>
         </div>

build.sbt

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

conf/cityparams.conf

@@ -14,6 +14,7 @@ city-params {
     "chicago-il"
     "amsterdam"
     "la-piedad"
+    "la-piedad-old"
     "oradell-nj"
     "validation-study"
     "zurich"
@@ -64,6 +65,7 @@ city-params {
     chicago-il = "usa"
     amsterdam = "netherlands"
     la-piedad = "mexico"
+    la-piedad-old = "mexico"
     oradell-nj = "usa"
     validation-study = ${city-params.country-id.seattle-wa}
     zurich = "switzerland"
@@ -91,6 +93,7 @@ city-params {
     chicago-il = "public"
     amsterdam = "public"
     la-piedad = "public"
+    la-piedad-old = "private"
     oradell-nj = "public"
     validation-study = "private"
     zurich = "private"
@@ -117,7 +120,8 @@ city-params {
     pittsburgh-pa = "2020-07-30"
     chicago-il = "2021-09-03"
     amsterdam = "2022-03-17"
-    la-piedad = "2022-03-17"
+    la-piedad = "2024-10-09"
+    la-piedad-old = "2022-03-17"
     oradell-nj = "2022-03-17"
     validation-study = "2022-05-10"
     zurich = "2022-11-08"
@@ -144,6 +148,7 @@ city-params {
     chicago-il = "skyline1.png"
     amsterdam = "skyline1.png"
     la-piedad = "skyline2.png"
+    la-piedad-old = "skyline2.png"
     oradell-nj = "skyline1.png"
     validation-study = "skyline1.png"
     zurich = "skyline1.png"
@@ -171,6 +176,7 @@ city-params {
     chicago-il = "sidewalk-logo.png"
     amsterdam = "sidewalk-logo.png"
     la-piedad = "sidewalk-logo2.png"
+    la-piedad-old = "sidewalk-logo2.png"
     oradell-nj = "sidewalk-logo.png"
     validation-study = "sidewalk-logo.png"
     zurich = "sidewalk-logo.png"
@@ -199,6 +205,7 @@ city-params {
       chicago-il = "https://sidewalk-chicago.cs.washington.edu"
       amsterdam = "https://sidewalk-amsterdam.cs.washington.edu"
       la-piedad = "https://sidewalk-la-piedad.cs.washington.edu"
+      la-piedad-old = "https://sidewalk-la-piedad-old.cs.washington.edu"
       oradell-nj = "https://sidewalk-oradell.cs.washington.edu"
       validation-study = "https://sidewalk-validation-study.cs.washington.edu"
       zurich = "https://sidewalk-zurich.cs.washington.edu"
@@ -226,6 +233,7 @@ city-params {
       chicago-il = "https://sidewalk-chicago-test.cs.washington.edu"
       amsterdam = "https://sidewalk-amsterdam-test.cs.washington.edu"
       la-piedad = "https://sidewalk-la-piedad-test.cs.washington.edu"
+      la-piedad-old = "https://sidewalk-la-piedad-old-test.cs.washington.edu"
       oradell-nj = "https://sidewalk-oradell-test.cs.washington.edu"
       validation-study = "https://sidewalk-validation-study-test.cs.washington.edu"
       zurich = "https://sidewalk-zurich-test.cs.washington.edu"
@@ -255,6 +263,7 @@ city-params {
       chicago-il = "G-EVL9RB7FLS"
       amsterdam = "G-TPMCR6MCX0"
       la-piedad = "G-6ZFQQ9TJ5P"
+      la-piedad-old = "G-6ZFQQ9TJ5P"
       oradell-nj = "G-X230K5TGHV"
       validation-study = "G-XEYDVZ5QMZ"
       zurich = "G-YQJ74CTZ1P"
@@ -282,6 +291,7 @@ city-params {
       chicago-il = "G-6NJ57TMFPZ"
       amsteram = "G-WWMMGEWQWQ"
       la-piedad = "G-TFT16K5SXF"
+      la-piedad-old = "G-TFT16K5SXF"
       oradell-nj = "G-GZC8MWJTVF"
       zurich = "G-QFM536EGLN"
       taipei = "G-H92Z46T5DG"

conf/evolutions/default/250.sql

@@ -0,0 +1,5 @@
+# --- !Ups
+INSERT INTO version VALUES ('7.20.8', now(), 'Fixes bug where labels were being saved with incorrect zoom level.');
+
+# --- !Downs
+DELETE FROM version WHERE version_id = '7.20.8';

conf/messages

@@ -15,6 +15,7 @@ city.name.pittsburgh-pa = Pittsburgh
 city.name.chicago-il = Chicago
 city.name.amsterdam = Amsterdam
 city.name.la-piedad = La Piedad
+city.name.la-piedad-old = La Piedad (old)
 city.name.oradell-nj = Oradell
 city.name.validation-study = Validation Study
 city.name.zurich = Zurich

conf/messages.zh-TW

@@ -65,6 +65,7 @@ city.name.pittsburgh-pa = 匹茲堡
 city.name.chicago-il = 芝加哥
 city.name.amsterdam = 阿姆斯特丹
 city.name.la-piedad = 拉彼達
+city.name.la-piedad-old = 拉彼達(old)
 city.name.oradell-nj = 奧拉德爾
 city.name.zurich = 蘇黎世
 city.name.taipei = 臺北市

public/javascripts/Gallery/css/cards.css

@@ -153,7 +153,7 @@ with respect to the image holder. This allows the validation menu to be placed o
     min-width: 0;
 }
 
-.gallery-modal-info-tags .label-tags-holder {
+.gallery-expanded-view-info-tags .label-tags-holder {
     align-items: start;
     overflow-y: auto;
 }
@@ -237,15 +237,15 @@ with respect to the image holder. This allows the validation menu to be placed o
     background-color: gray;
 }
 
-.modal-background-card {
+.expanded-view-background-card {
     opacity: 50%;
 }
 
-.modal-no-severity {
+.expanded-view-no-severity {
     filter: opacity(0.2);
 }
 
-.modal-severity-content {
+.expanded-view-severity-content {
     width: 100%;
 }
 

public/javascripts/Gallery/css/modal.css → public/javascripts/Gallery/css/expanded-view.css

@@ -1,12 +1,12 @@
-.gallery-modal-close {
+.gallery-expanded-view-close {
     left: 0px;
     top: 10%;
     position: relative;
     font-size: 30px;
     cursor: pointer;
 }
 
-.gallery-modal {
+.gallery-expanded-view {
     display: flex;
     height: 90vh;
     position: relative;
@@ -36,20 +36,23 @@
     margin-top: 2px;
 }
 
-.modal-severity-header, .modal-tag-header, .modal-temporary-header, .modal-description-header {
+.expanded-view-severity-header,
+.expanded-view-tag-header,
+.expanded-view-temporary-header,
+.expanded-view-description-header {
     font-weight: bold;
     color: #2d2a3f;
 }
 
-.modal-temporary-body, .modal-description-body {
+.expanded-view-temporary-body, .expanded-view-description-body {
     color: #888787;
 }
 
-.modal-description-body {
+.expanded-view-description-body {
     overflow: auto;
 }
 
-.gallery-modal-header {
+.gallery-expanded-view-header {
     width: 100%;
     height: 100%;
     margin-top: 15px;
@@ -58,7 +61,7 @@
     color: #2d2a3f;
 }
 
-.gallery-modal-pano {
+.gallery-expanded-view-pano {
     width: 100%;
     height: 63%;
     display: flex;
@@ -74,14 +77,14 @@
     background-color: transparent;
 }
 
-.gallery-modal-pano-display {
+.gallery-expanded-view-pano-display {
     position: relative;
     z-index: 10;
     width: 90%;
     height: 100%;
 }
 
-.gallery-modal-pano-paging {
+.gallery-expanded-view-pano-paging {
     height: 30px;
     width: 50px;
     color: black;
@@ -93,11 +96,11 @@
     background-color: transparent;
 }
 
-.gallery-modal-pano-paging:disabled {
+.gallery-expanded-view-pano-paging:disabled {
     color: lightgray;
 }
 
-.gallery-modal-info {
+.gallery-expanded-view-info {
     display: flex;
     padding-bottom: 1%;
     height: 24%;
@@ -108,7 +111,7 @@
     overflow: hidden;
 }
 
-.gallery-modal-info-timestamps {
+.gallery-expanded-view-info-timestamps {
     display: flex;
     justify-content: space-between;
     width: 100%;
@@ -118,14 +121,14 @@
     padding-top: 0.1%;
 }
 
-.gallery-modal-info-severity {
+.gallery-expanded-view-info-severity {
     width: 20%;
     height: 40%;
     display: flex;
     flex-direction: column;
 }
 
-.gallery-modal-info-validation {
+.gallery-expanded-view-info-validation {
     width: 15%;
     height: 40%;
     display: flex;
@@ -135,7 +138,7 @@
     padding: 0px 10px 0px 5px;
 }
 
-.gallery-modal-info-tags {
+.gallery-expanded-view-info-tags {
     width: 65%;
     /* This ensures the height has to be a minimum of 5.5vw, which fits two rows of tags. */
     height: max(40%, 5.5vw);
@@ -144,7 +147,7 @@
     flex-direction: column;
 }
 
-.gallery-modal-info-temporary {
+.gallery-expanded-view-info-temporary {
     width: 35%;
     /* Reduce the 45% by however much the tags container's height was adjusted. */
     height: calc(45% - (max(40%, 5.5vw) - 40%));
@@ -153,19 +156,19 @@
     overflow: hidden;
 }
 
-.gallery-modal-info-description {
+.gallery-expanded-view-info-description {
     width: 65%;
     /* Reduce the 45% by however much the tags container's height was adjusted. */
     height: calc(45% - (max(40%, 5.5vw) - 40%));
     display: flex;
     flex-direction: column;
 }
 
-.gallery-modal-pano:hover .modal-validation-button {
+.gallery-expanded-view-pano:hover .expanded-view-validation-button {
     opacity: 0.6;
 }
 
-.modal-validation-button, .modal-validation-button-selected {
+.expanded-view-validation-button, .expanded-view-validation-button-selected {
     opacity: 0;
     font-size: 1.25vw;
     font-weight: bold;
@@ -175,26 +178,26 @@
     color: #2d2a3f;
 }
 
-.gallery-modal-pano:hover .modal-validation-button-selected {
+.gallery-expanded-view-pano:hover .expanded-view-validation-button-selected {
     opacity: 1;
     background-color: gray;
 }
 
-.modal-top-holder {
+.expanded-view-top-holder {
     display: flex;
     align-content: space-between;
     margin-bottom: 5px;
     /* Full width of modal minus 50px for prev arrow and 50px for next arrow, plus a few extra for the pano border. */
     width: calc(100% - 105px);
 }
 
-.modal-severity-circle {
+.expanded-view-severity-circle {
     width: 1.5vw;
     height: 1.5vw;
     margin: 2px;
 }
 
-#modal-current-severity {
+#expanded-view-current-severity {
     border: 2px solid black;
     padding: 0px;
     background-color: black;