NextRelease to master

UI/csv_import.html

@@ -85,6 +85,11 @@
 
                 </div>
 
+                <div class="checkbox" id="csvImportLanesStartDates">
+                    <input type="checkbox" id ="startDateCheckbox">
+                    <label id="labelCsvImportLanesStartDatesCheckbox"><b>Päivitä vain alkupäivänmäärät</b></label>
+                </div>
+
                 <div class="form-group mass-transit-stop-limit">
                     <div class="checkbox">
                         <label><input type="checkbox" name="limit-import-to-roads">Rajoita CSV-tuonti maanteille</label><br />

UI/newuser.html

@@ -10,6 +10,7 @@
     <script type="text/javascript">
 
         var operatorCheckbox = "input[id='operatorCheckbox']";
+        var laneMaintainerCheckbox = "input[id='laneMaintainerCheckbox']";
         var municipalityCheckbox = "input[id='municipalitiesCheckbox']";
         var elysCheckbox = "input[id='elysCheckbox']";
         var areasCheckbox = "input[id='areasCheckbox']";
@@ -27,11 +28,12 @@
                      {name: "Kaakkois-Suomi", id: 8},
                      {name: "Uusimaa", id: 9}];
 
-        var userSpecs =[{ role: "municipality", enabledCheckbox: [ municipalityCheckbox ], disabledCheckbox: [ operatorCheckbox, elysCheckbox, areasCheckbox]   },
-                        { role: "ely", enabledCheckbox: [ elysCheckbox, areasCheckbox ], disabledCheckbox: [operatorCheckbox,  municipalityCheckbox]  },
-                        { role: "operator" ,  enabledCheckbox: [operatorCheckbox], disabledCheckbox: [ elysCheckbox,  municipalityCheckbox, areasCheckbox ] },
-                        { role: "areas",  enabledCheckbox: [ areasCheckbox, elysCheckbox ], disabledCheckbox: [ municipalityCheckbox, operatorCheckbox ] },
-                        { role: "default", enabledCheckbox: [ areasCheckbox, elysCheckbox, operatorCheckbox, municipalityCheckbox], disabledCheckbox: [] }];
+        var userSpecs =[{ role: "municipality", enabledCheckbox: [ municipalityCheckbox ], disabledCheckbox: [ laneMaintainerCheckbox,operatorCheckbox, elysCheckbox, areasCheckbox]   },
+            { role: "ely", enabledCheckbox: [ elysCheckbox, areasCheckbox ], disabledCheckbox: [laneMaintainerCheckbox,operatorCheckbox,  municipalityCheckbox]  },
+            { role: "operator" ,  enabledCheckbox: [operatorCheckbox,laneMaintainerCheckbox], disabledCheckbox: [ laneMaintainerCheckbox,elysCheckbox,  municipalityCheckbox, areasCheckbox ] },
+            { role: "laneMaintainer" ,  enabledCheckbox: [laneMaintainerCheckbox], disabledCheckbox: [operatorCheckbox, elysCheckbox,  municipalityCheckbox, areasCheckbox ] },
+            { role: "areas",  enabledCheckbox: [ areasCheckbox, elysCheckbox ], disabledCheckbox: [laneMaintainerCheckbox, municipalityCheckbox, operatorCheckbox ] },
+            { role: "default", enabledCheckbox: [ laneMaintainerCheckbox,areasCheckbox, elysCheckbox, operatorCheckbox, municipalityCheckbox], disabledCheckbox: [] }];
 
 
         function onChangeEvent() {
@@ -44,7 +46,10 @@
             } else {
               if ($(operatorCheckbox).is(':checked')) {
                 specs = _.find(userSpecs, function (spec) {return spec.role === "operator"});
-              } else {
+              } else if (($(laneMaintainerCheckbox).is(':checked'))) {
+                  specs = _.find(userSpecs, function (spec) {return spec.role === "laneMaintainer"});
+              }
+                else {
                 if ($(areasCheckbox).is(':checked')) {
                   specs = _.find(userSpecs, function (spec) {return spec.role === "areas"});
                 } else {
@@ -102,6 +107,14 @@
 
         }
 
+        function isLaneMaintainer() {
+            if($(laneMaintainerCheckbox).is(':checked'))
+                roleName.push('laneMaintainer');
+            else
+                delete roleName['laneMaintainer'];
+
+        }
+
         function getMunicipalities(){
             if(_.isEmpty($('.municipalities').find("#municipalities_search").find('option'))) {
                 if(_.isEmpty(municipalities)) {
@@ -214,7 +227,7 @@
         }
 
         function anyBoxChecked() {
-          return _.some([operatorCheckbox, municipalityCheckbox, elysCheckbox, areasCheckbox], function(checkbox){return $(checkbox).is(':checked');});
+          return _.some([operatorCheckbox,laneMaintainerCheckbox, municipalityCheckbox, elysCheckbox, areasCheckbox], function(checkbox){return $(checkbox).is(':checked');});
         }
 
         jQuery(document).ready(function($) {
@@ -332,6 +345,10 @@
                     <input type="checkbox" name="roleName" id = "operatorCheckbox" class="form-control" value="operator"  onchange="onChangeEvent(), isOperator()">
                     <label class="control-label" id="labelCheckboxOperator">Operaattori</label>
                 </div>
+                <div class="checkbox">
+                    <input type="checkbox" name="roleName" id = "laneMaintainerCheckbox" class="form-control" value="laneMaintainer"  onchange="onChangeEvent(), isLaneMaintainer()">
+                    <label class="control-label" id="labelCheckboxLaneMaintainer">Kaistat</label>
+                </div>
 
                 <div class="checkbox">
                     <input type="checkbox" id="areasCheckbox" name="roleName" value="serviceRoadMaintainer" class="form-control"  onchange="onChangeEvent(), isAreaMaintenance()">

UI/src/assetTypeConfiguration.js

@@ -1006,13 +1006,13 @@
         title: 'Kaistan mallinnustyökalu',
         newTitle: 'Uusi kaistan mallinnustyökalu',
         className: 'lane-modelling-tool',
-        authorizationPolicy: new LinearAssetAuthorizationPolicy(),
+        authorizationPolicy: new LaneAssetAuthorizationPolicy(),
         editControlLabels: {
           title: 'Kaistan mallinnustyökalu'
         },
         isSeparable: false,
         allowMapViewOnly: true,
-        allowComplementaryLinks: true,
+        allowComplementaryLinks: false,
         allowWalkingCyclingLinks: true,
         isVerifiable: false,
         showValidationErrorLabel: true,

UI/src/authorizationpolicies/authorizationPolicy.js

@@ -35,6 +35,10 @@
       return me.isUser('operator');
     };
 
+    this.isLaneMaintainer = function(){
+      return me.isUser('laneMaintainer');
+    };
+
     this.isServiceRoadMaintainer = function(){
       return me.isUser('serviceRoadMaintainer');
     };
@@ -55,7 +59,7 @@
     };
 
     this.editModeAccess = function() {
-      return (!me.isUser('viewer') && !me.isOnlyUser('serviceRoadMaintainer'));
+      return (!me.isUser('viewer') && !me.isUser('laneMaintainer') && !me.isOnlyUser('serviceRoadMaintainer'));
     };
 
     this.editModeTool = function(toolType, asset, roadLink) {};

UI/src/authorizationpolicies/laneAssetAuthorizationPolicy.js

@@ -0,0 +1,16 @@
+(function(root) {
+  root.LaneAssetAuthorizationPolicy = function() {
+    AuthorizationPolicy.call(this);
+
+    var me = this;
+
+    this.formEditModeAccess = function(selectedAsset) {
+      return  me.isStateExclusions(selectedAsset) ||  ( me.isLaneMaintainer() || me.isOperator() );
+    };
+
+    this.editModeAccess = function() {
+      return (!me.isUser('viewer') && me.isLaneMaintainer() || me.isOperator());
+    };
+
+  };
+})(this);

UI/src/controller/laneModellingCollection.js

@@ -42,7 +42,7 @@
       right.points = split.secondSplitVertices;
       right.startMeasure = split.splitMeasure;
 
-      if (self.calculateMeasure(left) < self.calculateMeasure(right)) {
+      if (left.startMeasure < right.startMeasure) {
         self.splitLinearAssets.created = left;
         self.splitLinearAssets.existing = right;
       } else {
@@ -53,9 +53,6 @@
       self.splitLinearAssets.created.id = 0;
       self.splitLinearAssets.existing.id = 0;
 
-      self.splitLinearAssets.created.marker = 'A';
-      self.splitLinearAssets.existing.marker = 'B';
-
       self.dirty = true;
       callback(self.splitLinearAssets);
     };

UI/src/csvImporter.js

@@ -27,6 +27,7 @@ $(function() {
     $('.btn.btn-primary.btn-lg').prop('disabled', !$(this).val());
     $('#deleteCheckbox').prop('disabled', !$(this).val());
     $('#csvImportPoistaCheckbox').toggle($(this).val() === 'trafficSigns');
+    $('#csvImportLanesStartDates').toggle($(this).val() === 'lanes');
     $('.mass-transit-stop-limit').toggle($(this).val() === 'massTransitStop');
   }).trigger('change');
 
@@ -75,13 +76,21 @@ $(function() {
       });
 
     } else if (assetType === "lanes") {
+      if(($('#startDateCheckbox').is(':checked'))) {
+        formData.append('updateStartDates', 'true');
+        uploadFile();
+        spinnerOn();
+      }
+      else {
         new GenericConfirmPopup('Huom: Kaikki vanha lisäkaistadata poistetaan, ja korvataan uudella', {
-        container: '.csv-content',
-        successCallback: function () {
-          uploadFile();
-          spinnerOn();
-        }
-      });
+          container: '.csv-content',
+          successCallback: function () {
+            uploadFile();
+            spinnerOn();
+          }
+        });
+      }
+
 
     }else {
       uploadFile();

UI/src/less/core/forms.less

@@ -507,7 +507,15 @@ input[type="checkbox"] {
       padding-top: 0;
       padding-left: 0;
     }
-
+
+    #labelCheckboxLaneMaintainer{
+      width: 23%;
+      font-size: 12px;
+      line-height: 15px;
+      padding-top: 0;
+      padding-left: 0;
+    }
+
     #labelCheckboxArea{
       width: 61%;
       font-size: 12px;
@@ -540,6 +548,10 @@ input[type="checkbox"] {
       width: 6%;
       margin-right: 18px;
     }
+    #laneMaintainerCheckbox {
+      width: 6%;
+      margin-right: 18px;
+    }
 
     #areasCheckbox {
       width: 6%;

UI/src/model/selectedLaneModelling.js

@@ -74,44 +74,42 @@
         return numberOfLanesByLaneCode[key] > 1;
       });
 
-      var lanesSortedByLaneCode = _.sortBy(lanes, getLaneCodeValue);
-
-      var duplicateLaneCounter = 0;
-      return _.map(lanesSortedByLaneCode, function (lane) {
-        if(_.includes(laneCodesToPutMarkers, getLaneCodeValue(lane).toString())) {
-          if (duplicateLaneCounter === 0){
-            lane.marker = 'A';
-            duplicateLaneCounter++;
-          }else{
-            lane.marker = 'B';
-            duplicateLaneCounter--;
+      var lanesSortedByEndMeasure = _.sortBy(lanes, function(lane) {
+        return lane.endMeasure;
+      });
+
+      _.forEach(laneCodesToPutMarkers, function (laneCode) {
+        var characterCounterForLaneMarker = 0;
+        for (var i = 0; i < lanesSortedByEndMeasure.length; i++) {
+          if (laneCode == getLaneCodeValue(lanesSortedByEndMeasure[i]).toString()) {
+            //The integer value of 'A' is 65, so every increment in the counter gives the next letter of the alphabet.
+            lanesSortedByEndMeasure[i].marker = String.fromCharCode(characterCounterForLaneMarker + 65);
+            characterCounterForLaneMarker += 1;
           }
         }
-        return lane;
       });
+
+      return lanesSortedByEndMeasure;
     };
 
     //Outer lanes that are expired are to be considered, the other are updates so we need to take those out
     //Here a outer lane is a lane with lane code that existed in the original but not in the modified configuration
     function omitIrrelevantExpiredLanes() {
       var lanesToBeRemovedFromExpire = _.filter(assetsToBeExpired, function (lane) {
-        return !_.isUndefined(self.getLane(getLaneCodeValue(lane)));
+        return !self.isOuterLane(getLaneCodeValue(lane));
       });
 
       _.forEach(lanesToBeRemovedFromExpire, function (lane) {
         _.remove(assetsToBeExpired, {'id': lane.id});
       });
     }
 
-    self.splitLinearAsset = function(laneNumber, split) {
-      collection.splitLinearAsset(self.getLane(laneNumber), split, function(splitLinearAssets) {
-        if (self.getLane(laneNumber).id === 0) {
-          self.removeLane(laneNumber);
-        } else {
-          self.expireLane(laneNumber);
-        }
-
+    self.splitLinearAsset = function(laneNumber, split, laneMarker) {
+      collection.splitLinearAsset(self.getLane(laneNumber, laneMarker), split, function(splitLinearAssets) {
+        var laneIndex = getLaneIndex(laneNumber, laneMarker);
+        self.selection.splice(laneIndex,1);
         self.selection.push(splitLinearAssets.created, splitLinearAssets.existing);
+        self.selection = giveSplitMarkers(self.selection);
         self.dirty = true;
         eventbus.trigger('laneModellingForm: reload');
       });
@@ -198,18 +196,25 @@
 
     self.lanesCutAreEqual = function() {
       var laneNumbers = _.map(self.selection, getLaneCodeValue);
-      var cuttedLaneNumbers = _.transform(_.countBy(laneNumbers), function(result, count, value) {
+      var cutLaneNumbers = _.transform(_.countBy(laneNumbers), function(result, count, value) {
         if (count > 1) result.push(value);
       }, []);
 
-      return _.some(cuttedLaneNumbers, function (laneNumber){
+      return _.some(cutLaneNumbers, function (laneNumber){
         var lanes = _.filter(self.selection, function (lane){
           return _.find(lane.properties, function (property) {
             return property.publicId == "lane_code" && _.head(property.values).value == laneNumber;
           });
         });
-
-        return _.isEqual(lanes[0].properties, lanes[1].properties);
+        var sortedLanes = _.sortBy(lanes, function (lane) {
+          return lane.endMeasure;
+        });
+        for (var i = 1; i < sortedLanes.length; i++) {
+          if (_.isEqual(sortedLanes[i - 1].properties, sortedLanes[i].properties)) {
+            return true;
+          }
+        }
+        return false;
       });
     };
 
@@ -255,9 +260,9 @@
           sideCode: sideCode,
           laneRoadAddressInfo:{
             roadNumber: roadNumber,
-            initialRoadPartNumber: parseInt(startRoadPartNumber),
-            initialDistance: parseInt(startDistance),
-            endRoadPartNumber: parseInt(endRoadPartNumber),
+            startRoadPart: parseInt(startRoadPartNumber),
+            startDistance: parseInt(startDistance),
+            endRoadPart: parseInt(endRoadPartNumber),
             endDistance: parseInt(endDistance),
             track: track
           },
@@ -382,7 +387,7 @@
 
       //expiredLane could be modified by the user so we need to fetch the original
       var originalExpiredLane = _.find(lanesFetched, {'id': expiredLane.id});
-      if (linksSelected.length > 1) {
+      if (linksSelected.length > 1 && _.isUndefined(marker)) {
         var expiredGroup = collection.getGroup(originalExpiredLane);
         expiredGroup.forEach(function (lane) {
           lane.isExpired = true;

UI/src/view/linear_asset/laneModellingForm.js

@@ -92,6 +92,12 @@
         values: [
           {id: 1, label: 'Pääkaista'}
           ]
+      },
+      {
+        label: 'Alkupvm', type: 'date', publicId: "start_date", weight: 13, required: true
+      },
+      {
+        label: 'Loppupvm', type: 'date', publicId: "end_date", weight: 14
       }
     ]
   };
@@ -443,23 +449,20 @@
         });
       });
 
+      asset = _.sortBy(asset, function (lane) {
+        return lane.marker;
+      });
+
       var body = createBodyElement(selectedAsset.getCurrentLane());
 
       if(selectedAsset.isSplit()) {
-        //Render form A
-        renderFormElements(_.find(asset,{'marker': 'A'}), isReadOnly, 'A', selectedAsset.setValue, selectedAsset.getValue, false, body);
-
-        if(!isReadOnly)
-          renderExpireAndDeleteButtonsElement(selectedAsset, body, 'A');
 
-        body.find('.form').append('<hr class="form-break">');
-        //Render form B
-        renderFormElements(_.find(asset,{'marker': 'B'}), isReadOnly, 'B', selectedAsset.setValue, selectedAsset.getValue, false, body);
-
-        if(!isReadOnly)
-          renderExpireAndDeleteButtonsElement(selectedAsset, body, 'B');
+        _.forEach(asset, function (lane) {
+          renderFormElements(lane, isReadOnly, lane.marker, selectedAsset.setValue, selectedAsset.getValue, false, body);
+          if(!isReadOnly) renderExpireAndDeleteButtonsElement(selectedAsset, body, lane.marker);
+          body.find('.form').append('<hr class="form-break">');
+        });
 
-        body.find('.form').append('<hr class="form-break">');
       }else{
         renderFormElements(asset[0], isReadOnly, '', selectedAsset.setValue, selectedAsset.getValue, isDisabled, body);