Merge pull request #263 from af83/5750-non-commercial-stop-areas

5750 non commercial stop areas

13 files changed, 219 insertions, 123 deletions

diff --git a/app/javascript/helpers/master_slave.coffee b/app/javascript/helpers/master_slave.coffee
new file mode 100644
index 000000000..4866a55e3
--- /dev/null
+++ b/app/javascript/helpers/master_slave.coffee
@@ -0,0 +1,18 @@
+class MasterSlave
+  constructor: (selector)->
+    $(selector).find('[data-master]').each (i, slave)->
+      $slave = $(slave)
+      master = $($slave.data().master)
+      console.log $slave
+      console.log $slave.find("input:disabled, select:disabled")
+      $slave.find("input:disabled, select:disabled").attr "data-slave-force-disabled", "true"
+      toggle = ->
+        val = master.filter(":checked").val() if master.filter("[type=radio]").length > 0
+        val ||= master.val()
+        selected = val == $slave.data().value
+        $slave.toggle selected
+        $slave.find("input, select").filter(":not([data-slave-force-disabled])").attr "disabled", !selected
+      master.change toggle
+      toggle()
+
+export default MasterSlave
diff --git a/app/javascript/helpers/routes_map.coffee b/app/javascript/helpers/routes_map.coffee
new file mode 100644
index 000000000..85def1390
--- /dev/null
+++ b/app/javascript/helpers/routes_map.coffee
@@ -0,0 +1,157 @@
+class RoutesMap
+  constructor: (@target)->
+    @initMap()
+    @area = []
+    @seenStopIds = []
+    @routes = {}
+
+  initMap: ->
+    @map = new ol.Map
+      target: @target,
+      layers:   [ new ol.layer.Tile(source: new ol.source.OSM()) ]
+      controls: [ new ol.control.ScaleLine(), new ol.control.Zoom(), new ol.control.ZoomSlider() ],
+      interactions: ol.interaction.defaults(zoom: true)
+      view: new ol.View()
+
+  addRoutes: (routes)->
+    for route in routes
+      @addRoute route
+
+  addRoute: (route)->
+    geoColPts = []
+    geoColLns = []
+    @routes[route.id] = route if route.id
+    stops = route.stops || route
+    geoColEdges = [
+      new ol.Feature({
+        geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stops[0].longitude), parseFloat(stops[0].latitude)]))
+      }),
+      new ol.Feature({
+        geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stops[stops.length - 1].longitude), parseFloat(stops[stops.length - 1].latitude)]))
+      })
+    ]
+    stops.forEach (stop, i) =>
+      if i < stops.length - 1
+        geoColLns.push new ol.Feature
+          geometry: new ol.geom.LineString([
+            ol.proj.fromLonLat([parseFloat(stops[i].longitude), parseFloat(stops[i].latitude)]),
+            ol.proj.fromLonLat([parseFloat(stops[i + 1].longitude), parseFloat(stops[i + 1].latitude)])
+          ])
+
+      geoColPts.push(new ol.Feature({
+        geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stop.longitude), parseFloat(stop.latitude)]))
+      }))
+      unless @seenStopIds.indexOf(stop.stoparea_id) > 0
+        @area.push [parseFloat(stop.longitude), parseFloat(stop.latitude)]
+        @seenStopIds.push stop.stoparea_id
+
+    vectorPtsLayer = new ol.layer.Vector({
+      source: new ol.source.Vector({
+        features: geoColPts
+      }),
+      style: @defaultStyles(),
+      zIndex: 2
+    })
+    route.vectorPtsLayer = vectorPtsLayer if route.id
+    vectorEdgesLayer = new ol.layer.Vector({
+      source: new ol.source.Vector({
+        features: geoColEdges
+      }),
+      style: @edgeStyles(),
+      zIndex: 3
+    })
+    route.vectorEdgesLayer = vectorEdgesLayer if route.id
+    vectorLnsLayer = new ol.layer.Vector({
+      source: new ol.source.Vector({
+        features: geoColLns
+      }),
+      style: [@lineStyle()],
+      zIndex: 1
+    })
+    route.vectorLnsLayer = vectorLnsLayer if route.id
+    @map.addLayer vectorPtsLayer
+    @map.addLayer vectorEdgesLayer
+    @map.addLayer vectorLnsLayer
+
+  lineStyle: (highlighted=false)->
+    new ol.style.Style
+      stroke: new ol.style.Stroke
+        color: if highlighted then "#ed7f00" else '#007fbb'
+        width: 3
+
+  edgeStyles: (highlighted=false)->
+    new ol.style.Style
+      image: new ol.style.Circle
+        radius: 5
+        stroke: new ol.style.Stroke
+          color: if highlighted then "#ed7f00" else '#007fbb'
+          width: 2
+        fill: new ol.style.Fill
+          color: if highlighted then "#ed7f00" else '#007fbb'
+          width: 2
+
+  defaultStyles: (highlighted=false)->
+    new ol.style.Style
+      image: new ol.style.Circle
+        radius: 4
+        stroke: new ol.style.Stroke
+          color: if highlighted then "#ed7f00" else '#007fbb'
+          width: 2
+        fill: new ol.style.Fill
+          color: '#ffffff'
+          width: 2
+
+  addRoutesLabels: ->
+    labelsContainer = $("<ul class='routes-labels'></ul>")
+    labelsContainer.appendTo $("##{@target}")
+    @vectorPtsLayer = null
+    @vectorEdgesLayer = null
+    @vectorLnsLayer = null
+    Object.keys(@routes).forEach (id)=>
+      route = @routes[id]
+      label = $("<li>#{route.name}</ul>")
+      label.appendTo labelsContainer
+      label.mouseleave =>
+        route.vectorPtsLayer.setStyle @defaultStyles(false)
+        route.vectorEdgesLayer.setStyle @edgeStyles(false)
+        route.vectorLnsLayer.setStyle @lineStyle(false)
+        route.vectorPtsLayer.setZIndex 2
+        route.vectorEdgesLayer.setZIndex 3
+        route.vectorLnsLayer.setZIndex 1
+        @fitZoom()
+      label.mouseenter =>
+        route.vectorPtsLayer.setStyle @defaultStyles(true)
+        route.vectorEdgesLayer.setStyle @edgeStyles(true)
+        route.vectorLnsLayer.setStyle @lineStyle(true)
+        route.vectorPtsLayer.setZIndex 11
+        route.vectorEdgesLayer.setZIndex 12
+        route.vectorLnsLayer.setZIndex 10
+        @fitZoom(route)
+
+  fitZoom: (route)->
+    if route
+      area = []
+      route.stops.forEach (stop, i) =>
+        area.push [parseFloat(stop.longitude), parseFloat(stop.latitude)]
+    else
+      area = @area
+    boundaries = ol.extent.applyTransform(
+      ol.extent.boundingExtent(area), ol.proj.getTransform('EPSG:4326', 'EPSG:3857')
+    )
+    @map.getView().fit boundaries, @map.getSize()
+    tooCloseToBounds = false
+    mapBoundaries = @map.getView().calculateExtent @map.getSize()
+    mapWidth = mapBoundaries[2] - mapBoundaries[0]
+    mapHeight = mapBoundaries[3] - mapBoundaries[1]
+    marginSize = 0.1
+    heightMargin = marginSize * mapHeight
+    widthMargin = marginSize * mapWidth
+    tooCloseToBounds = tooCloseToBounds || (boundaries[0] - mapBoundaries[0]) < widthMargin
+    tooCloseToBounds = tooCloseToBounds || (mapBoundaries[2] - boundaries[2]) < widthMargin
+    tooCloseToBounds = tooCloseToBounds || (boundaries[1] - mapBoundaries[1]) < heightMargin
+    tooCloseToBounds = tooCloseToBounds || (mapBoundaries[3] - boundaries[3]) < heightMargin
+    if tooCloseToBounds
+      @map.getView().setZoom(@map.getView().getZoom() - 1)
+
+
+export default RoutesMap
diff --git a/app/javascript/helpers/stop_area_header_manager.js b/app/javascript/helpers/stop_area_header_manager.js
index c9f397dee..2c820caf9 100644
--- a/app/javascript/helpers/stop_area_header_manager.js
+++ b/app/javascript/helpers/stop_area_header_manager.js
@@ -19,7 +19,7 @@ export default class StopAreaHeaderManager {
       <div
         className={(showHeadline) ? 'headlined' : ''}
         data-headline={showHeadline}
-        title={sp.city_name + ' (' + sp.zip_code +')'}
+        title={sp.city_name ? sp.city_name + ' (' + sp.zip_code +')' : ""}
       >
         <span>
           <span>
@@ -27,6 +27,8 @@ export default class StopAreaHeaderManager {
             {sp.time_zone_formatted_offset && <span className="small">
               &nbsp;({sp.time_zone_formatted_offset})
             </span>}
+            {sp.area_kind == 'non_commercial' && <span className="fa fa-question-circle" title={sp.area_type_i18n}>
+            </span>}
           </span>
         </span>
       </div>
diff --git a/app/javascript/packs/referential_lines/show.js b/app/javascript/packs/referential_lines/show.js
new file mode 100644
index 000000000..542188018
--- /dev/null
+++ b/app/javascript/packs/referential_lines/show.js
@@ -0,0 +1,10 @@
+import clone from '../../helpers/clone'
+import RoutesMap from '../../helpers/routes_map'
+
+let routes = clone(window, "routes", true)
+routes = JSON.parse(decodeURIComponent(routes))
+
+var map = new RoutesMap('routes_map')
+map.addRoutes(routes)
+// map.addRoutesLabels()
+map.fitZoom()
diff --git a/app/javascript/packs/routes/show.js b/app/javascript/packs/routes/show.js
index 71777c379..c20de0800 100644
--- a/app/javascript/packs/routes/show.js
+++ b/app/javascript/packs/routes/show.js
@@ -1,121 +1,8 @@
 import clone from '../../helpers/clone'
+import RoutesMap from '../../helpers/routes_map'
+
 let route = clone(window, "route", true)
 route = JSON.parse(decodeURIComponent(route))
-
-const geoColPts = []
-const geoColLns = []
-const area = []
-const geoColEdges = [
-  new ol.Feature({
-    geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(route[0].longitude), parseFloat(route[0].latitude)]))
-  }),
-  new ol.Feature({
-    geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(route[route.length - 1].longitude), parseFloat(route[route.length - 1].latitude)]))
-  })
-]
-route.forEach(function (stop, i) {
-  if (i < route.length - 1) {
-    geoColLns.push(new ol.Feature({
-      geometry: new ol.geom.LineString([
-        ol.proj.fromLonLat([parseFloat(route[i].longitude), parseFloat(route[i].latitude)]),
-        ol.proj.fromLonLat([parseFloat(route[i + 1].longitude), parseFloat(route[i + 1].latitude)])
-      ])
-    }))
-  }
-  geoColPts.push(new ol.Feature({
-    geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stop.longitude), parseFloat(stop.latitude)]))
-  }))
-  area.push([parseFloat(stop.longitude), parseFloat(stop.latitude)])
-})
-var edgeStyles = new ol.style.Style({
-  image: new ol.style.Circle(({
-    radius: 5,
-    stroke: new ol.style.Stroke({
-      color: '#007fbb',
-      width: 2
-    }),
-    fill: new ol.style.Fill({
-      color: '#007fbb',
-      width: 2
-    })
-  }))
-})
-var defaultStyles = new ol.style.Style({
-  image: new ol.style.Circle(({
-    radius: 4,
-    stroke: new ol.style.Stroke({
-      color: '#007fbb',
-      width: 2
-    }),
-    fill: new ol.style.Fill({
-      color: '#ffffff',
-      width: 2
-    })
-  }))
-})
-var lineStyle = new ol.style.Style({
-  stroke: new ol.style.Stroke({
-    color: '#007fbb',
-    width: 3
-  })
-})
-
-var vectorPtsLayer = new ol.layer.Vector({
-  source: new ol.source.Vector({
-    features: geoColPts
-  }),
-  style: defaultStyles,
-  zIndex: 2
-})
-var vectorEdgesLayer = new ol.layer.Vector({
-  source: new ol.source.Vector({
-    features: geoColEdges
-  }),
-  style: edgeStyles,
-  zIndex: 3
-})
-var vectorLnsLayer = new ol.layer.Vector({
-  source: new ol.source.Vector({
-    features: geoColLns
-  }),
-  style: [lineStyle],
-  zIndex: 1
-})
-
-var map = new ol.Map({
-  target: 'route_map',
-  layers: [
-    new ol.layer.Tile({
-      source: new ol.source.OSM()
-    }),
-    vectorPtsLayer,
-    vectorEdgesLayer,
-    vectorLnsLayer
-  ],
-  controls: [new ol.control.ScaleLine(), new ol.control.Zoom(), new ol.control.ZoomSlider()],
-  interactions: ol.interaction.defaults({
-    zoom: true
-  }),
-  view: new ol.View({
-    center: ol.proj.fromLonLat([parseFloat(route[0].longitude), parseFloat(route[0].latitude)]),
-    zoom: 13
-  })
-});
-const boundaries = ol.extent.applyTransform(
-  ol.extent.boundingExtent(area), ol.proj.getTransform('EPSG:4326', 'EPSG:3857')
-)
-map.getView().fit(boundaries, map.getSize());
-let tooCloseToBounds = false
-const mapBoundaries = map.getView().calculateExtent(map.getSize())
-const mapWidth = mapBoundaries[2] - mapBoundaries[0]
-const mapHeight = mapBoundaries[3] - mapBoundaries[1]
-const marginSize = 0.1
-const heightMargin = marginSize * mapHeight
-const widthMargin = marginSize * mapWidth
-tooCloseToBounds = tooCloseToBounds || (boundaries[0] - mapBoundaries[0]) < widthMargin
-tooCloseToBounds = tooCloseToBounds || (mapBoundaries[2] - boundaries[2]) < widthMargin
-tooCloseToBounds = tooCloseToBounds || (boundaries[1] - mapBoundaries[1]) < heightMargin
-tooCloseToBounds = tooCloseToBounds || (mapBoundaries[3] - boundaries[3]) < heightMargin
-if(tooCloseToBounds){
-  map.getView().setZoom(map.getView().getZoom() - 1)
-}
+var map = new RoutesMap('route_map')
+map.addRoute(route)
+map.fitZoom()
diff --git a/app/javascript/packs/stop_areas/new.js b/app/javascript/packs/stop_areas/new.js
new file mode 100644
index 000000000..ffe702cdb
--- /dev/null
+++ b/app/javascript/packs/stop_areas/new.js
@@ -0,0 +1,3 @@
+import MasterSlave from "../../helpers/master_slave"
+
+new MasterSlave("form")
diff --git a/app/javascript/routes/components/StopPointList.js b/app/javascript/routes/components/StopPointList.js
index 43a027084..b39fa0c9c 100644
--- a/app/javascript/routes/components/StopPointList.js
+++ b/app/javascript/routes/components/StopPointList.js
@@ -56,7 +56,7 @@ export default function StopPointList({ stopPoints, onDeleteClick, onMoveUpClick
   )
 }
 
-StopPointList.PropTypes = {
+StopPointList.propTypes = {
   stopPoints: PropTypes.array.isRequired,
   onDeleteClick: PropTypes.func.isRequired,
   onMoveUpClick: PropTypes.func.isRequired,
@@ -68,4 +68,4 @@ StopPointList.PropTypes = {
 
 StopPointList.contextTypes = {
   I18n: PropTypes.object
-}
\ No newline at end of file
+}
diff --git a/app/javascript/vehicle_journeys/actions/index.js b/app/javascript/vehicle_journeys/actions/index.js
index 2675328e3..4a4ec371d 100644
--- a/app/javascript/vehicle_journeys/actions/index.js
+++ b/app/javascript/vehicle_journeys/actions/index.js
@@ -380,6 +380,17 @@ const actions = {
         }
       })
   },
+
+  validate : (dispatch, vehicleJourneys, next) => {
+    dispatch(actions.didValidateVehicleJourneys(vehicleJourneys))
+    actions.submitVehicleJourneys(dispatch, vehicleJourneys, next)
+  },
+
+  didValidateVehicleJourneys : (vehicleJourneys) => ({
+    type: 'DID_VALIDATE_VEHICLE_JOURNEYS',
+    vehicleJourneys
+  }),
+
   submitVehicleJourneys : (dispatch, state, next) => {
     dispatch(actions.fetchingApi())
     let urlJSON = window.location.pathname + "_collection.json"
diff --git a/app/javascript/vehicle_journeys/components/SaveVehicleJourneys.js b/app/javascript/vehicle_journeys/components/SaveVehicleJourneys.js
index 6e94b04a3..fb921df9c 100644
--- a/app/javascript/vehicle_journeys/components/SaveVehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/components/SaveVehicleJourneys.js
@@ -13,7 +13,7 @@ export default class SaveVehicleJourneys extends SaveButton{
   }
 
   submitForm(){
-    this.props.onSubmitVehicleJourneys(this.props.dispatch, this.props.vehicleJourneys)
+    this.props.validate(this.props.vehicleJourneys, this.props.dispatch)
   }
 }
 
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourney.js b/app/javascript/vehicle_journeys/components/VehicleJourney.js
index d240757a3..2b5783dda 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourney.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourney.js
@@ -153,6 +153,9 @@ export default class VehicleJourney extends Component {
                       />
                   </span>
                 </div>
+                {vj.errors && <div className="errors">
+                  {vj.errors}
+                </div>}
             </div>
           </div>
         )}
diff --git a/app/javascript/vehicle_journeys/components/VehicleJourneys.js b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
index b188962c2..256ca81f9 100644
--- a/app/javascript/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/components/VehicleJourneys.js
@@ -89,7 +89,7 @@ export default class VehicleJourneys extends Component {
               </div>
             )}
 
-            { _.some(this.props.vehicleJourneys, 'errors') && (
+            { this.props.vehicleJourneys.errors && this.props.vehicleJourneys.errors.length && _.some(this.props.vehicleJourneys, 'errors') && (
               <div className="alert alert-danger mt-sm">
                 <strong>Erreur : </strong>
                 {this.props.vehicleJourneys.map((vj, index) =>
diff --git a/app/javascript/vehicle_journeys/containers/SaveVehicleJourneys.js b/app/javascript/vehicle_journeys/containers/SaveVehicleJourneys.js
index f5f879ed8..3daf831f8 100644
--- a/app/javascript/vehicle_journeys/containers/SaveVehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/containers/SaveVehicleJourneys.js
@@ -23,6 +23,9 @@ const mapDispatchToProps = (dispatch) => {
     },
     onSubmitVehicleJourneys: (next, state) => {
       actions.submitVehicleJourneys(dispatch, state, next)
+    },
+    validate: (state) =>{
+      actions.validate(dispatch, state)
     }
   }
 }
diff --git a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
index ae45993a8..1a15ec46d 100644
--- a/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
+++ b/app/javascript/vehicle_journeys/reducers/vehicleJourneys.js
@@ -273,6 +273,8 @@ export default function vehicleJourneys(state = [], action) {
           return vj
         }
       })
+    case 'DID_VALIDATE_VEHICLE_JOURNEYS':
+      return [...action.vehicleJourneys]
     default:
       return state
   }