Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Technical update #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 43 additions & 26 deletions config.json
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,29 +1,45 @@
{ "splash": {
"iframe": "http://172.16.10.39/ws/demo/splash_enr.html"
"iframe": "stories/dinan_leon/splash.html"
},
"theme": {"css":"stories/enr_reg/enr_reg.css"},
"tooltip" : {"fields": ["nom_region"]},
"theme": {"css":"stories/dinan_leon/dinan_leon_t3.css"},
"tooltip" : {"fields": ["nom"]},
"map": {
"center": [-220750.13768758904,6144925.57790189],
"zoom": 11,
"center": [-227028,6182514],
"zoom": 16,
"width": "100%",
"overview": true,
"url" : "http://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"animation": true
"overview": false,
"url" : "https://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png",
"animation": false
},
"data": {
"title": "La production d'énergie renouvelable en France",
"subtitle": "Démo",
"title": "DE DINAN À LÉHON" ,
"subtitle":"Par le chemin de halage",
"template": {"name": "carousel", "options": {"width":"50%", "color":"#7f8c8d"} },
"url": "http://geobretagne.fr/geoserver/mig/wfs?request=getFeature&typename=mig:regions_nouvelles&outputFormat=application/json&srsName=EPSG:3857",
"orderby": "order",
"url": "stories/dinan_leon/dinan_leon.geojson",
"orderby": "ordre",
"fields": [{
"name": "nom_region",
"type": "title"
},
"name": "nom",
"type": "title"
},
{
"name":"iframe",
"type":"iframe"
"name":"resume",
"type":"text"
},
{
"name":"localisation",
"type":"text"
},
{
"name":"historique",
"type":"text"
},
{
"name":"lien_image",
"type":"background"
},
{
"name":"lien_dossi",
"type":"url"
}],
"analyse": {
"type": "single",
Expand All @@ -32,27 +48,28 @@
"styles": [
{
"fill": {
"color": "rgba(206,227,147,0)"
"color": "rgba(206,0,0,0.7)"
},
"stroke": {
"color": "rgba(206,227,147,0.2)",
"color": "rgba(206,0,0,0.2)",
"width": 2
},
"icon": {
"src" : "https://kartenn.region-bretagne.fr/storymap/stories/dinan_leon/image/placeholder_black.svg",
"scale" : 0.07
}
}
]
},
"hightlightstyle": {
"fill": {
"color": "rgba(206,227,147, 0.6)"
},
"stroke": {
"color": "rgba(206,227,147,1.0)",
"width": 4
"icon": {
"src" : "https://kartenn.region-bretagne.fr/storymap/stories/dinan_leon/image/placeholder_black_light.svg",
"scale" : 0.09
}
}
},
"extradata": {
"url": "stories/enr_reg/enr_region.csv",
"url": "stories/dinan_leon/dinan_lehon_bis.csv",
"linkfield" : "id"
}

Expand Down
36 changes: 9 additions & 27 deletions index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -4,42 +4,24 @@
<meta charset="UTF-8" name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<base href="/storymap/"></base>
<title>Kartenn story</title>
<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/mustache.js/2.3.0/mustache.min.js"></script>-->
<link rel="stylesheet" href="lib/bootstrap_3.3.7/css/bootstrap.min.css">
<script src="lib/jquery_1.12.4/jquery.min.js"></script>
<script src="lib/bootstrap_3.3.7/js/bootstrap.min.js"></script>
<script src="lib/mustache_2.3.0/mustache.min.js"></script>
<script src="lib/papaparse/4.1.2/papaparse.min.js"></script>
<link rel="stylesheet" href="lib/ol/4.5/ol.css" type="text/css">
<link rel="stylesheet" href="lib/bootstrap/3.4.1/css/bootstrap.min.css">
<script src="lib/jquery/3.2.1/jquery.min.js"></script>
<script src="lib/bootstrap/3.4.1/js/bootstrap.min.js"></script>
<script src="lib/mustache/4.1.0/mustache.min.js"></script>
<script src="lib/papaparse/5.0.2/papaparse.min.js"></script>
<link rel="stylesheet" href="lib/ol/9.2.4/ol.css" type="text/css">
<link rel="stylesheet" href="lib/stretchy-navigation/css/style.css">
<link rel="stylesheet" href="css/storymap.css" type="text/css">
<script src="lib/stretchy-navigation/js/modernizr.js"></script> <!-- Modernizr -->
<script src="lib/ol/4.5/ol.js"></script>
<script src="lib/ol/9.2.4/ol.js"></script>
<!-- TODO templates lazy loading" -->
<script src="templates/carousel.js"></script>
<script src="templates/list.js"></script>
</head>
<body>
<div id="bandeau"></div>
<header>
<!--<nav class="cd-stretchy-nav add-content">
<a class="cd-nav-trigger" href="#">
<span aria-hidden="true"></span>
</a>

<ul>
<li><a href="#" id="btn-home" onclick="ks.menuaction(event);" class="glyphicon"><span>Accueil</span></a></li>
<li><a href="#" id="btn-extent" onclick="ks.menuaction(event);" class="glyphicon"><span>Zoom</span></a></li>
<li><a href="#" id="btn-infos" onclick="ks.menuaction(event);" class="glyphicon"><span>crédits</span></a></li>
<li><a href="#" id="btn-share" onclick="ks.menuaction(event);" class="glyphicon"><span>Partager</span></a></li>
</ul>

<span aria-hidden="true" class="stretchy-nav-bg"></span>
</nav>-->
</header>
<header>
</header>
<div id="bandeau" ></div>
<div id="map" class="map"></div>
<div id="tools" class="btn-group-vertical btn-group-sm" role="group" aria-label="true" >
Expand Down
10 changes: 5 additions & 5 deletions js/storymap.js
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,9 @@ ks = (function() {
source: new ol.source.Vector(),
style: _highlight
});
//Config map controls
var _controls = ol.control.defaults();
if (options.map.overview) {

//var _controls = ol.control.defaults();
/** if (options.map.overview) {
_controls.extend([
new ol.control.OverviewMap({
className: 'ol-overviewmap ol-custom-overviewmap',
Expand All @@ -193,7 +193,7 @@ ks = (function() {
collapsed: false
})
]);
}
}*/
//Config map
var _backgroundlayer;
if (options.backgroundlayer && options.backgroundlayer.type && options.backgroundlayer.url) {
Expand Down Expand Up @@ -239,7 +239,7 @@ ks = (function() {
});
}
_map = new ol.Map({
controls: _controls,
// controls: [ customOverviewMapControl ],
layers: [_backgroundlayer],
target: 'map',
view: new ol.View({
Expand Down
6 changes: 6 additions & 0 deletions lib/bootstrap/3.4.1/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions lib/bootstrap/3.4.1/css/bootstrap-theme.min.css.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions lib/bootstrap/3.4.1/css/bootstrap.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions lib/bootstrap/3.4.1/css/bootstrap.min.css.map

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions lib/bootstrap/3.4.1/js/bootstrap.min.js

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions lib/bootstrap_3.3.7/css/bootstrap.min.css

This file was deleted.

7 changes: 0 additions & 7 deletions lib/bootstrap_3.3.7/js/bootstrap.min.js

This file was deleted.

4 changes: 4 additions & 0 deletions lib/jquery/3.2.1/jquery.min.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions lib/jquery/3.7.1/jquery-3.7.1.min.js

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions lib/jquery_1.12.4/jquery.min.js

This file was deleted.

1 change: 1 addition & 0 deletions lib/mustache/4.1.0/mustache.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading