Update app, bug fixes and moon

planmap-eu · Jun 29, 2019 · 1321837 · 1321837
1 parent b919720
commit 1321837
Show file tree

Hide file tree

Showing 26 changed files with 1,272 additions and 610 deletions.
diff --git a/app/assets/css/_app.css b/app/assets/css/_app.css
diff --git a/app/assets/css/_app_blu.css b/app/assets/css/_app_blu.css
diff --git a/app/assets/css/app.css → app/assets/css/style.css b/app/assets/css/app.css → app/assets/css/style.css
@@ -48,18 +48,16 @@ input[type="radio"], input[type="checkbox"] {margin: 0;}
 .fa.pull-right {color: #999999;}
 
 .navbarmap {background-color: #ffffff;border-color: #ffffff;}
-.green {color: #09515C;}
+.green {color: #09515C!important;}
 .caption {font-style: italic;}
 
-a.green:link {color: #09515C;}
-a.green:visited {color: #09515C;}
-a.green:hover {color: #09515C;}
-a.green:active {color: #09515C;}
-
-.chevron_mars{color: #e5572a!important;}
-.chevron_mercury{color: #555f80!important;}
-.chevron_moon{color: #8b8385!important;}
+a.green:link {color: #09515C!important;}
+a.green:visited {color: #09515C!important;}
+a.green:hover {color: #09515C!important;}
+a.green:active {color: #09515C!important;}
 
+.videocontainer {position: relative; width: 100%; height: 0; padding-bottom: 56.25%; margin-top: 20px;}
+.videoiframe {position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
 
 @media (max-width: 767px) {
 	#sidebar {display: none;}

diff --git a/app/data/empty.json b/app/data/empty.json
@@ -0,0 +1,79 @@
+{
+  "storymap_title": "",
+  "Authors": "",
+  "planmap_id": "",
+  "publication": "",
+  "basemap": {
+    "url": "",
+    "options": {
+      "crs": "",
+      "maxNativeZoom": 9,
+      "tms": "false",
+      "autoZIndex": "true",
+      "center": [0, 0],
+      "attribution": "<a href='https://github.com/openplanetary/opm/wiki/OPM-Basemaps' target='_blank'>OpenPlanetaryMap</a>"
+    },
+    "loaded_layers": [{
+      "order": "",
+      "path": "",
+      "type": "",
+      "credits": ""
+    }]
+  },    
+  "chapters": [{
+      "chapter_title":"Chapter 1",
+      "chapter_id":"1",      
+      "steps": [{
+        "title": "",
+        "text": "",
+        "loaded_layers": [{
+          "order": "",
+          "path": "",
+          "type": "",
+          "credits": ""
+        }],
+        "media": [{
+          "path": "",
+          "type": "",
+          "caption": "",
+          "stoptime": ""
+        }],        
+        "view": {
+          "extent": [0, 0, 0, 0],
+          "marker": ""
+        }
+      }]
+    },{
+      "chapter_title":"Chapter 2",
+      "chapter_id":"2",      
+      "steps": [{
+        "title": "",
+        "text": "",
+        "loaded_layers": [{
+          "credits": "",
+          "path": "",
+          "type": ""
+        },{
+          "credits": "",
+          "path": "",
+          "type": ""
+        }],       
+        "media": [{
+          "path": "",
+          "type": "",
+          "caption": "",
+          "stoptime": ""
+        },{
+          "path": "",
+          "type": "",
+          "caption": "",
+          "stoptime": ""
+        }],
+        "view": {
+          "extent": [0, 0, 0, 0],
+          "marker": ""
+        }
+      }]
+    }
+  ]
+}
diff --git a/app/data/gale.json b/app/data/gale.json
@@ -6,12 +6,19 @@
   "basemap": {
     "url": "https://cartocdn-gusc.global.ssl.fastly.net/opmbuilder/api/v1/map/named/opm-mars-basemap-v0-1/0,1,2,3,4/{z}/{x}/{y}.png",
     "options": {
-      "crs": "L.CRS.EPSG3857",
+      "crs": "",
       "maxNativeZoom": 9,
       "tms": "false",
       "autoZIndex": "true",
+      "center": [-4.630259002640354, 137.40749814285536],
       "attribution": "<a href='https://github.com/openplanetary/opm/wiki/OPM-Basemaps' target='_blank'>OpenPlanetaryMap</a>"
-    }
+    },
+    "loaded_layers": [{
+      "order": "",
+      "path": "",
+      "type": "",
+      "credits": ""
+    }]
   },    
   "chapters": [{
       "chapter_title":"Chapter 1",
@@ -116,7 +123,7 @@
           "credits": "NASA MRO HiRISE/NASA/JPL/University of Arizona"
         }],
         "view": {
-          "extent": [135, -8, 143, 0],
+          "extent": [137.2593930, -4.7319811, 137.5040463, -4.5720141],
           "marker": ""
         }
       }]
@@ -127,9 +134,9 @@
         "title": "A Martian geologist: Curiosity",
         "text": "Orbital data are key to our work, but nothing can replace the ground truth. That’s why we sent Mars Science Laboratory rover Curiosity on Mars. Curiosity is a true field geologist. Equipped with high-resolution cameras, microscopes and an entire geochemical lab, this rover allows us to remotely study the terrains encountered in Gale Crater. Using its data, we can learn what kind of rocks are present in Gale, their exact chemical composition or their structures. All these information are important for us understand the paleoenvironmental conditions which they were deposited under, billions of years ago.",
         "media": [{
-          "path": "stories/mars/gale/media/chapter_05/Curiosity_static.glb",
-          "type": "model/gltf-binary",
-          "caption": "3D mesh by NASA/JPL-Caltech",
+          "path": "stories/mars/gale/media/chapter_05/Curiosity_static.jpg",
+          "type": "image/jpeg",
+          "caption": "NASA/JPL-Caltech/MSSS",
           "stoptime": ""
         }],
         "loaded_layers": [{
@@ -214,8 +221,8 @@
         "title": "Future mapping work on Kimberley",
         "text": "While Curiosity is not at Kimberley any longer, the geological mapping continues! Geologists are currently developing new technologies to improve study and mapping of Mars, by reconstructing in 3D and in Virtual Reality outcrops like Kimberley.",
         "media": [{
-            "path": "stories/mars/gale/media/Kimberley_300k_light.obj",
-            "type": "model/obj",
+            "path": "stories/mars/gale/media/chapter_08/Kimberley_300k_light.jpg",
+            "type": "image/jpeg",
             "caption": "3D mesh of the Kimberley outcrop, G. Caravaca, S. Le Mouélic, N. Mangold, LPG Nantes",
             "stoptime": ""
         }],