Skip to content

Commit

Permalink
Merge pull request #235 from tomvantilburg/master
Browse files Browse the repository at this point in the history 
merge from Tom
  • Loading branch information
@tomvantilburg
tomvantilburg committed Apr 8, 2014
2 parents bfd3d2e + 947331e commit fa2b1c6
Show file tree
Hide file tree
Showing 8 changed files with 188 additions and 588 deletions.
197 changes: 174 additions & 23 deletions config/geofort.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,196 @@ var icmconfig = {
[ {id:'situatie', title: 'Situatie', isedit: false, zeker: true}
]}
,{ beeld: 'populatie', title: 'Populatie', timestamp: 0, beeldonderdeel:
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true},
{title:'Gebiedsoverzicht',id:'gebied', isedit: false, zeker: true},
{title:'Besluitsvorming',id:'besluitsvorming', isedit: false, zeker: true},
{title:'Knelpunten',id:'knelpunten', isedit: false, zeker: true},
{title:'Acties/maatregelen',id:'maatregelen', isedit: false, zeker: true},
{title:'Prognose (verwachting)',id:'prognose', isedit: false, zeker: true}
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true}
]}
,{ beeld: 'evacuatie', title: 'Evacutatie', timestamp: 0, beeldonderdeel:
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true},
{title:'Routeoverzicht',id:'routes', isedit: false, zeker: true},
{title:'Besluitsvorming',id:'besluitsvorming', isedit: false, zeker: true},
{title:'Knelpunten',id:'knelpunten', isedit: false, zeker: true},
{title:'Acties/maatregelen',id:'maatregelen', isedit: false, zeker: true},
{title:'Prognose (verwachting)',id:'prognose', isedit: false, zeker: true}
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true}
]}
,{ beeld: 'opvang', title: 'Opvang', timestamp: 0, beeldonderdeel:
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true},
{title:'Locatie overzicht',id:'locaties', isedit: false, zeker: true},
{title:'Besluitsvorming',id:'besluitsvorming', isedit: false, zeker: true},
{title:'Knelpunten',id:'knelpunten', isedit: false, zeker: true},
{title:'Acties/maatregelen',id:'maatregelen', isedit: false, zeker: true},
{title:'Prognose (verwachting)',id:'prognose', isedit: false, zeker: true}
[ {title:'Samenvatting',id:'samenvatting', isedit: false, zeker: true}
]}
,{ beeld: 'comms', title: 'Communicatie', timestamp: 0, beeldonderdeel:
[ {title:'Kernboodschap',id:'kernboodschap', isedit: false, zeker: true},
{title:'Omgevingsbeeld',id:'omgevingsbeeld', isedit: false, zeker: true},
{title:'Communicatie extern',id:'extern', isedit: false, zeker: true},
{title:'Communicatie intern',id:'intern', isedit: false, zeker: true}
[ {title:'Samenvatting',id:'kernboodschap', isedit: false, zeker: true}
]}
],
drawstyles:{
linestyles: [
{stroke: '#000'},
{stroke: '#f57900'},
{stroke: '#204a87'},
{stroke: '#cc0000'},
{stroke: '#5c3566'},
{stroke: '#4e9a06'}],
polygonstyles: [
{stroke: '#000' ,fill: '#000' },
{stroke: '#f57900',fill: '#f57900'},
{stroke: '#204a87',fill: '#204a87'},
{stroke: '#cc0000',fill: '#cc0000'},
{stroke: '#5c3566',fill: '#5c3566'},
{stroke: '#4e9a06',fill: '#4e9a06'}],
icontypes:[
{"cat":"none", "text":"ZW", "url":"mapicons/direction_downleft.png"}
,{"cat":"none", "text":"Z","url":"mapicons/direction_down.png"}
,{"cat":"none", "text":"ZO","url":"mapicons/direction_downright.png"}
,{"cat":"none", "text":"O","url":"mapicons/direction_left.png"}
,{"cat":"none", "text":"W","url":"mapicons/direction_right.png"}
,{"cat":"none", "text":"NW","url":"mapicons/direction_upleft.png"}
,{"cat":"none", "text":"N","url":"mapicons/direction_up.png"}
,{"cat":"none", "text":"NO","url":"mapicons/direction_upright.png"}
,{"cat":"none", "text":"Afgesloten","url":"mapicons/accesdenied.png"}
,{"cat":"none", "text":"Let op!","url":"mapicons/caution.png"}
,{"cat":"none", "text":"Groepsvervoer","url":"mapicons/bus.png"}
,{"cat":"none", "text":"Parkeerplaats","url":"mapicons/parkinggarage.png"}
,{"cat":"none", "text":"EHBO","url":"mapicons/firstaid.png"}
,{"cat":"none", "text":"Noodtelefoon","url":"mapicons/emergencyphone.png"}
,{"cat":"none", "text":"Ambulancepost","url":"mapicons/ambulance.png"}
,{"cat":"none", "text":"Ziekenhuis","url":"mapicons/hospital-building.png"}
,{"cat":"none", "text":"Apotheek","url":"mapicons/medicine.png"}
,{"cat":"none", "text":"School","url":"mapicons/school.png"}
,{"cat":"none", "text":"Zaal","url":"mapicons/communitycentre.png"}
,{"cat":"none", "text":"Verzorgingstehuis","url":"mapicons/seniorsite.png"}
,{"cat":"none", "text":"none","url":"mapicons/family.png"}
,{"cat":"none", "text":"Kinderopvang","url":"mapicons/daycare.png"}
,{"cat":"none", "text":"Calamiteit","url":"mapicons/blast.png"}
,{"cat":"none", "text":"Dodelijke slachtoffers","url":"mapicons/skull.png"}
,{"cat":"none", "text":"Schade aan huis","url":"mapicons/earthquake-3.png"}
,{"cat":"none", "text":"Stroomuitval","url":"mapicons/poweroutage.png"}
,{"cat":"none", "text":"Brand","url":"mapicons/fire.png"}
,{"cat":"none", "text":"Overstroming","url":"mapicons/flood.png"}
,{"cat":"none", "text":"Radio zender","url":"mapicons/radio-station-2.png"}
,{"cat":"none", "text":"Verzamelpunt","url":"mapicons/regroup.png"}
,{"cat":"none", "text":"Netwerk","url":"mapicons/wifi.png"}
,{"cat":"none", "text":"Groep mensen","url":"mapicons/group-2.png"}
,{"cat":"none", "text":"Brandweer","url":"mapicons/firemen.png"}
,{"cat":"none", "text":"Politie","url":"mapicons/police.png"}
,{"cat":"none", "text":"Camera","url":"mapicons/cctv.png"}
,{"cat":"none", "text":"Gemeentehuis","url":"mapicons/moderntower.png"}
,{"cat":"none", "text":"Commentaar","url":"mapicons/comment-map-icon.png"}
,{"cat":"none", "text":"Happy","url":"mapicons/smiley_happy.png"}
]
},
"definedlayers":{
osm: {
name: "Openstreetmap",
url: 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
type: 'xyz'
}
},
osm_grey: {
name: 'OSM grey',
url: 'http://a.www.toolserver.org/tiles/bw-mapnik/{z}/{x}/{y}.png',
type: 'xyz'
}
},
"layers":
{
"ahn1": {"type": "overlay", "category": "Terrein", "layer": {"type":"betterwms","visible":true,"name":"Hoogtekaart","url":"http://t3.edugis.nl/tiles/tilecache.py?map=maps/edugis/cache/hoogte.map","layerOptions":{"layers":"hoogtes","format":"image/png","transparent":true,"opacity":0.8}}}
}
};


var addGeofortLayers = function(LeafletService,map){
/* Floodlayer */
var data = [];
var floodlayer = new L.geoJson(data, {
style: function (feature) {
var style = {};
if (feature.properties.tijdstip == 'na 4 uur'){
style.opacity = 0.2;
}
else if (feature.properties.tijdstip == 'na 8 uur'){
style.opacity = 0.4;
}
else if (feature.properties.tijdstip == 'na 12 uur'){
style.opacity = 0.6;
}
else if (feature.properties.tijdstip == 'na 16 uur'){
style.opacity = 0.8;
}
//style.fillOpacity = 0;
style.fillColor = "None";
return style;
},
onEachFeature: function (feature, layer) {
layer.bindPopup(feature.properties.tijdstip);
}
}).addTo(map);
floodlayer.name = 'Model uitvoer';
floodlayer.buttonclass = true;
LeafletService.layers.icmlayers.floodlayer = floodlayer;
//self.layercontrol.addOverlay(floodlayer,"Inundatie");
d3.json('./data/flood_merged.geojson',function(data){
var collection = {"type":"FeatureCollection","features":[]};
collection.features = data.features;
floodlayer.addData(collection);
});
/*Kwetsbare objecten*/
var geojsonMarkerOptions = {
radius: 8,
fillColor: "#ff7800",
color: "#000",
weight: 1,
opacity: 1,
fillOpacity: 0.8
};

var kwetsbareobjectenlayer = new L.geoJson(data, {
pointToLayer: function(feature, latlng){
return L.circleMarker(latlng, geojsonMarkerOptions);
},
style: function (feature) {
if (feature.properties.PRIORITEIT == 1){
return {fillColor: 'red'};
}
else if (feature.properties.PRIORITEIT == 2){
return {fillColor: 'orange'};
}
else if (feature.properties.PRIORITEIT == 3){
return {fillColor: 'yellow'};
}
else if (feature.properties.PRIORITEIT == 4){
return {fillColor: 'blue'};
}
else{
return {fillColor: 'blue'};
}
},
onEachFeature: function (feature, layer) {
layer.bindLabel(feature.properties.ROT_NAAM + "<br>" + (feature.properties.OMSCHRI5 || ''),{ noHide: false });
layer.bindPopup(feature.properties.ROT_NAAM + "<br>" + (feature.properties.OMSCHRI5 || ''));
}
});
kwetsbareobjectenlayer.buttonclass = false;
kwetsbareobjectenlayer.name = 'Kwetsbare objecten';
LeafletService.layers.icmlayers.kwetsbareobjectenlayer = kwetsbareobjectenlayer;
//self.layercontrol.addOverlay(kwetsbareobjectenlayer,"Kwetsbare objecten");
d3.json('./data/kwetsbareobjecten.geojson',function(data){
var collection = {"type":"FeatureCollection","features":[]};
collection.features = data.features;
kwetsbareobjectenlayer.addData(collection);
});

/* Opvanglocaties */
var opvanglocatieslayer = new L.geoJson(data, {
pointToLayer: function(feature, latlng){
return L.circleMarker(latlng, geojsonMarkerOptions);
},
style: function (feature) {
return {color: 'red',weight: 1};
},
onEachFeature: function (feature, layer) {
layer.bindLabel(feature.properties.naam,{ noHide: false });
layer.bindPopup(feature.properties.omschrijvi);
}
});
opvanglocatieslayer.name = 'Opvanglocaties';
opvanglocatieslayer.buttonclass = false;
LeafletService.layers.icmlayers.opvanglocatieslayer = opvanglocatieslayer;
//self.layercontrol.addOverlay(opvanglocatieslayer,"Openbare functies");
//d3.json('./data/publieke_functie.geojson',function(data){
d3.json('./data/opvanglocaties.geojson',function(data){
var collection = {"type":"FeatureCollection","features":[]};
collection.features = data.features;
opvanglocatieslayer.addData(collection);
});
};

7 changes: 6 additions & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
<!-- signalR -->
<script type="text/javascript" src="./lib/cow/lib/jquery-2.0.3/jquery-2.0.3.js"></script>
<script type="text/javascript" src="./lib/cow/lib/jquery.signalR/jquery.signalR-2.0.2.js"></script>
<!--
<script type="text/javascript" src="/Cow/signalr/hubs"></script> <!-- CHANGE THIS TO CORRECT SIGNALR SERVER URL -->

<!-- COW -->
<script type="text/javascript" src="./lib/cow/lib/underscore/underscore-min.js" ></script>
<script type="text/javascript" src="./lib/cow/src/cow2.utils.js" ></script>
Expand All @@ -26,7 +28,10 @@
<script type="text/javascript" src="./lib/cow/src/cow2.group.js" ></script>
<script type="text/javascript" src="./lib/cow/src/cow2.item.js" ></script>
<script type="text/javascript" src="./lib/cow/src/cow2.project.js" ></script>
<!--
<script type="text/javascript" src="./lib/cow/src/cow2.signalR.js" ></script>
-->
<script type="text/javascript" src="./lib/cow/src/cow2.websocket.js" ></script>
<script type="text/javascript" src="./lib/cow/src/cow2.core.js" ></script>
<script type="text/javascript" src="./lib/cow/lib/polyfill-promise/promise-0.1.1.min.js"></script>
<script type="text/javascript" src="./src/cow.icms.js" ></script>
Expand Down Expand Up @@ -90,7 +95,7 @@
<script type="text/javascript" src="lib/ui-bootstrap-tpls-0.10.0.min.js"></script>

<!-- Change the config to the correct project -->
<script type="text/javascript" src="./config/hhnk.js" ></script>
<script type="text/javascript" src="./config/geofort.js" ></script>
<script type="text/javascript" src="src/state.js"></script>
<script type="text/javascript" src="src/services.js"></script>
<script type="text/javascript" src="src/factories.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion lib/cow
Submodule cow updated 2 files
+6 −0 README.md
+54 −5 src/cow2.websocket.js
7 changes: 5 additions & 2 deletions src/controllers/leafletCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ icm.controller('LeafletController', [ '$scope','$http','$timeout','Core', 'Utils
labelconfig: {
field: "name",
style: {
'stroke-width': 0.2,
'stroke-width': 1,
stroke: "#000033"
}
},
Expand Down Expand Up @@ -623,6 +623,9 @@ icm.controller('LeafletController', [ '$scope','$http','$timeout','Core', 'Utils
map.addLayer(extentLayer);
map.addLayer(featureLayer);

/** Add geofort layers **/
addGeofortLayers(LeafletService,map);

/** SETUP DRAWING FUNCTIONALITY **/
// Use a geoJson object for the drawnItems instead of featureGroup
var drawnItems = new L.geoJson();
Expand Down Expand Up @@ -680,7 +683,7 @@ icm.controller('LeafletController', [ '$scope','$http','$timeout','Core', 'Utils
feature.properties.stroke = $scope.currentstyle.line.stroke;
}
feature.properties.fill = $scope.currentstyle.polygon.fill;
feature.properties['stroke-width'] = 3;
feature.properties['stroke-width'] = 6;

var id = core.peerid() + "_" + timestamp;
var mygroups = core.project().myGroups();
Expand Down
3 changes: 2 additions & 1 deletion src/factories.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ icm.factory('Beelden', ['$rootScope', function( $rootScope ) {

/*TT: Cow temporarily moved to a global because signalR breaks from within a factory */
var cow = new Cow.core({
wsUrl: '/Cow/signalr'
//wsUrl: '/Cow/signalr'
wsUrl: 'wss://websocket.geodan.nl:443/'
});
cow.userStore().loaded.then(function(){
//if (!cow.users('1')){
Expand Down
Loading

0 comments on commit fa2b1c6

Please sign in to comment.