Revert "Merge pull request #3312 from finnishtransportagency/DROTH-41…

…53_pavement_class_changes_combined" This reverts commit 394aac9, reversing changes made to 69460ec.
finnishtransportagency · Oct 16, 2024 · 74f7e20 · 74f7e20
1 parent 0b9429a
commit 74f7e20
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 137 deletions.
diff --git a/UI/src/assetTypeConfiguration.js b/UI/src/assetTypeConfiguration.js
@@ -500,10 +500,13 @@
                 label: 'Paallysteluokka', type: 'single_choice', publicId: "paallysteluokka", defaultValue: "99", weight: 1,
                 values: [
                   {id: 99, label: 'Päällystetty, tyyppi tuntematon'},
-                  {id: 1, label: 'Asfaltti'},
+                  {id: 1, label: 'Betoni'},
                   {id: 2, label: 'Kivi'},
-                  {id: 3, label: 'Sitomaton kulutuskerros'},
-                  {id: 4, label: 'Muut päällysteluokat'}
+                  {id: 10, label: 'Kovat asfalttibetonit'},
+                  {id: 20, label: 'Pehmeät asfalttibetonit'},
+                  {id: 30, label: 'Soratien pintaus'},
+                  {id: 40, label: 'Sorakulutuskerros'},
+                  {id: 50, label: 'Muut pinnoitteet'}
                 ]
               },
               {label: "vihjetieto", type: 'checkbox', defaultValue: "0", publicId: "suggest_box", values: [{id: 0, label: 'Tarkistettu'}, {id: 1, label: 'Vihjetieto'}], weight: 2, showAndHide: showSuggestBox, isUnSet: isSuggestBoxUnset}

diff --git a/UI/src/less/core/variables.less b/UI/src/less/core/variables.less
@@ -85,7 +85,7 @@
 @linear-asset-node-13: #a52a2a; //brown
 @linear-asset-node-14: #ffe82d; //yellow
 @linear-asset-node-15: #11bb00; //green
-@linear-asset-node-16: #ac0019; //dark red
+@linear-asset-node-16: #ac0019; //drak red
 @linear-asset-node-17: #439232; //dark green
 @linear-asset-node-22: #40ad89; //dark mint
 
@@ -148,10 +148,13 @@
 @care-class-24: @linear-asset-18;
 
 //**Pavement Class colors
-@paved-road-1:  @linear-asset-4;  //red
-@paved-road-2:  @linear-asset-5;  //blue
-@paved-road-3:  @linear-asset-13; //yellow
-@paved-road-4:  @linear-asset-2;  //pink
+@paved-road-1:  @linear-asset-10; //purple
+@paved-road-2:  @linear-asset-2;  //pink
+@paved-road-10: @linear-asset-4;  //red
+@paved-road-20: @linear-asset-5;  //blue
+@paved-road-30: @linear-asset-3;  //green
+@paved-road-40: @linear-asset-13; //yellow
+@paved-road-50: @linear-asset-19;  //brown
 @paved-road-99: @linear-asset-8;  //black
 
 //**Carrying Capacity colors

diff --git a/UI/src/less/site/action-panel.less b/UI/src/less/site/action-panel.less
@@ -457,10 +457,13 @@
       margin-bottom: 0;
     }
 
-    .paved-road-1  { .linear-asset-legend-entry(@paved-road-1, @linear-asset-node-16); }
-    .paved-road-2  { .linear-asset-legend-entry(@paved-road-2, @linear-asset-node-5); }
-    .paved-road-3 { .linear-asset-legend-entry(@paved-road-3, @linear-asset-node-11); }
-    .paved-road-4 { .linear-asset-legend-entry(@paved-road-4, @linear-asset-node-2); }
+    .paved-road-1  { .linear-asset-legend-entry(@paved-road-1, @linear-asset-node-8); }
+    .paved-road-2  { .linear-asset-legend-entry(@paved-road-2, @linear-asset-node-2); }
+    .paved-road-10 { .linear-asset-legend-entry(@paved-road-10, @linear-asset-node-4); }
+    .paved-road-20 { .linear-asset-legend-entry(@paved-road-20, @linear-asset-node-5); }
+    .paved-road-30 { .linear-asset-legend-entry(@paved-road-30, @linear-asset-node-3); }
+    .paved-road-40 { .linear-asset-legend-entry(@paved-road-40, @linear-asset-node-14); }
+    .paved-road-50 { .linear-asset-legend-entry(@paved-road-50, @linear-asset-node-13); }
     .paved-road-99 { .linear-asset-legend-entry(@paved-road-99, @linear-asset-node-12); }
   }
 }

diff --git a/UI/src/view/linear_asset/pavedRoadStyle.js b/UI/src/view/linear_asset/pavedRoadStyle.js
@@ -24,10 +24,13 @@
 
     var pavedRoadStyleRules = [
       new StyleRule().where('hasAsset').is(false).use({ stroke : { color: '#7f7f7c'}}),
-      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(1).use({stroke: {color: '#ff0000'}}),
-      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(2).use({stroke: {color: '#0011bb'}}),
-      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(3).use({stroke: {color: '#ffe82d'}}),
-      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(4).use({stroke: {color: '#ff55dd'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(1).use({stroke: {color: '#c559ff'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(2).use({stroke: {color: '#ff55dd'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(10).use({stroke: {color: '#ff0000'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(20).use({stroke: {color: '#0011bb'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(30).use({stroke: {color: '#11bb00'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(40).use({stroke: {color: '#ffe82d'}}),
+      new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(50).use({stroke: {color: '#a52a2a'}}),
       new StyleRule().where(function(asset){if(valueExists(asset, "paallysteluokka")){return findValue(asset, "paallysteluokka"); }}).is(99).use({stroke: {color: '#000000'}})
     ];
 

diff --git a/UI/src/view/navigationpanel/pavedRoadBox.js b/UI/src/view/navigationpanel/pavedRoadBox.js
@@ -13,10 +13,13 @@
 
     this.labeling = function () {
       var pavementClassValues = [
-        [1, 'Asfaltti'],
+        [1, 'Betoni'],
         [2, 'Kivi '],
-        [3, 'Sitomaton kulutuskerros'],
-        [4, 'Muut päällysteluokat'],
+        [10, 'Kovat asfalttibetonit'],
+        [20, 'Pehmeät asfalttibetonit'],
+        [30, 'Soratien pintaus'],
+        [40, 'Sorakulutuskerros '],
+        [50, 'Muut pinnoitteet'],
         [99, 'Päällystetty, tyyppi tuntematon']
       ];
 

diff --git a/digiroad2-geo/src/main/scala/fi/liikennevirasto/digiroad2/asset/asset.scala b/digiroad2-geo/src/main/scala/fi/liikennevirasto/digiroad2/asset/asset.scala
@@ -296,7 +296,7 @@ sealed trait PavementClass {
 }
 case class ConversionIntoPavementClassException(msg:String) extends Exception(msg) 
 object PavementClass {
-  val values = Set(Asphalt, Cobblestone, UnboundWearLayer, OtherPavementClasses, Unknown)
+  val values = Set(CementConcrete, Cobblestone, HardAsphalt, SoftAsphalt, GravelSurface, GravelWearLayer, OtherCoatings, Unknown)
 
   def apply(value: Int): PavementClass = {
     values.find(_.value == value).getOrElse(Unknown)
@@ -336,10 +336,13 @@ object PavementClass {
     }
   }
 
-  case object Asphalt extends PavementClass { def value = 1; def typeDescription = "Asphalt";}
+  case object CementConcrete extends PavementClass { def value = 1; def typeDescription = "Cement Concrete";}
   case object Cobblestone extends PavementClass { def value = 2; def typeDescription = "Cobblestone";}
-  case object UnboundWearLayer extends PavementClass { def value = 3; def typeDescription = "Unbound Wear Layer";}
-  case object OtherPavementClasses extends PavementClass { def value = 4; def typeDescription = "Other Pavement Classes";}
+  case object HardAsphalt extends PavementClass { def value = 10; def typeDescription = "Hard Asphalt";}
+  case object SoftAsphalt extends PavementClass { def value = 20; def typeDescription = "Soft Asphalt";}
+  case object GravelSurface extends PavementClass { def value = 30; def typeDescription = "Gravel Surface";}
+  case object GravelWearLayer extends PavementClass { def value = 40; def typeDescription = "Gravel Wear Layer";}
+  case object OtherCoatings extends PavementClass { def value = 50; def typeDescription = "Other Coatings";}
   case object Unknown extends PavementClass { def value = 99;  def typeDescription = "Unknown";}
 }
 

diff --git a/.../main/resources/db/migration/V1_46__insert_new_pavement_classes_into_enumerated_value.sql b/.../main/resources/db/migration/V1_46__insert_new_pavement_classes_into_enumerated_value.sql
diff --git a/...urces/db/migration/V1_47__update_single_choice_value_and_delete_from_enumerated_value.sql b/...urces/db/migration/V1_47__update_single_choice_value_and_delete_from_enumerated_value.sql
diff --git a/...src/test/scala/fi/liikennevirasto/digiroad2/service/pointasset/PavedRoadServiceSpec.scala b/...src/test/scala/fi/liikennevirasto/digiroad2/service/pointasset/PavedRoadServiceSpec.scala
@@ -29,9 +29,9 @@ class PavedRoadServiceSpec extends FunSuite with Matchers {
   val linearAssetDao = new PostGISLinearAssetDao()
   val dynamicLinearAssetDao = new DynamicLinearAssetDao()
 
-  val multiTypePropSeq = DynamicAssetValue(Seq(DynamicProperty("suggest_box","checkbox",required = false,List()),DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("4")))))
-  val multiTypePropSeq1 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("3")))))
-  val multiTypePropSeq2 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("1")))))
+  val multiTypePropSeq = DynamicAssetValue(Seq(DynamicProperty("suggest_box","checkbox",required = false,List()),DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("50")))))
+  val multiTypePropSeq1 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("40")))))
+  val multiTypePropSeq2 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("10")))))
   val multiTypePropSeq3 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("99")))))
   val multiTypePropSeq4 = DynamicAssetValue(Seq(DynamicProperty("paallysteluokka", "single_choice", required = false, Seq(DynamicPropertyValue("0")))))