GeoGuideProject · felipemfp · Nov 22, 2017 · Nov 17, 2017 · Nov 17, 2017 · Nov 17, 2017
diff --git a/.gitignore b/.gitignore
@@ -8,7  8,6 @@ __pycache__
 *.coverage
 .DS_Store
 env.sh
-migrations
 
 tmp/
 **/dataanalysis/dspoints/

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6  5,8 @@ services:
     image: mdillon/postgis
     volumes:
       - ./pgdata:/var/lib/postgresql/data
     ports:
       - 54320:5432
 
   web:
     build: .

diff --git a/geoguide/client/static/src/pageEnvironment/index.css b/geoguide/client/static/src/pageEnvironment/index.css
@@ -10,21  10,40 @@ html, body {
 }
 
 .controlContainer {
   padding-right: 10px;
   padding-left: 10px;
   padding-top: 10px;
   padding-bottom: 10px;
   pointer-events: none;
 }
 
 .controlContainer.horizontal {
   width: calc(100% - 10px);
 }
 
 .control {
   pointer-events: auto;
-  width: 32em;
   background: #fff;
   box-shadow: 0 1px 3px rgba(0,0,0,.15);
   border: 2px solid #fff;
   border-radius: 3px;
   margin-bottom: 10px;
 }
 
 .control.simple {
   padding: 0;
 }
 
 .control.simple .title {
   padding: 0 5px;
   line-height: 25px;
 }
 
 .control.simple .collapse {
   margin: 1em 9px 9px 9px;
   width: 30em;
 }
 
 .control .title {
   margin-top: 0;
   font-size: 1em;
@@ -70,12  89,34 @@ html, body {
 
 #controlCharts {
   max-height: 37em;
-  overflow-y: auto;
   display: flex;
   justify-content: space-around;
   /*overflow-y: auto;*/
 }
 
 .custom-filters {
   min-width: 10em;
   width: initial;
   max-width: initial;
   margin-bottom: 0;
 }
 
 .custom-filters #controlCharts {
   overflow-x: auto;
   white-space: nowrap;
 }
 
 .chart {
   height: 180px;
   margin-bottom: 10px;
   /* max-height: 180px;
   width: 30%;
   margin-bottom: 5px; */
   display: inline-block;
 }
 
 .chart[hidden] {
   display: none;
 }
 
 .reset {

diff --git a/geoguide/client/static/src/pageEnvironment/index.js b/geoguide/client/static/src/pageEnvironment/index.js
@@ -27,14  27,25 @@ let isHeatMap = false
 let isHeatMapCluster = false
 let datasetData = {}
 let datasetOptions = JSON.parse(document.querySelector('#dataset_json').innerHTML)
 let datasetVisibleAttrs = datasetOptions.attributes.reduce((obj, i) => {
   return { ...obj, [i.description]: i.visible }
 }, {})
 let datasetFilters = datasetOptions.headers;
 let mouseTrackingCoordinates = []
 let mouseTrackingMarkers = []
-let chartsPerPage = 2
 let chartsPerPage = 3
 let currentChartIndex = 0
 let mouseClusters = {}
 let mousePolygons = []
 
 modifiers.onColorModifierChange(e => {
   refreshModifiers()
 })
 
 modifiers.onSizeModifierChange(e => {
   refreshModifiers()
 })
 
 if (typeof(Storage) !== "undefined") {
   let filename = JSON.parse(document.querySelector('#dataset_json').innerHTML).filename;
   let ls;
@@ -47,7  58,7 @@ if (typeof(Storage) !== "undefined") {
       "kvalue": document.getElementById("kvalue").value,
       "onlyfilteredpoints": document.getElementById("onlyfilteredpoints").checked
     };
-    
 
   } else {
     ls = JSON.parse(localStorage.getItem(filename));
 
@@ -132,7  143,7 @@ const initMap = () => {
       style: google.maps.MapTypeControlStyle.DROPDOWN_MENU
     },
     disableDefaultUI: true,
-    zoomControl: true,
     zoomControl: false,
     mapTypeControl: true,
     zoomControlOptions: {
       position: google.maps.ControlPosition.RIGHT_BOTTOM,
@@ -167,7  178,10 @@ const initMap = () => {
   map.controls[google.maps.ControlPosition.TOP_RIGHT].push(heatMapDiv)
 
   let customControlsLeftTopElement = document.getElementById('customControlsLeftTop')
-  map.controls[google.maps.ControlPosition.LEFT_TOP].push(customControlsLeftTopElement)
   map.controls[google.maps.ControlPosition.TOP_RIGHT].push(customControlsLeftTopElement)
 
   let customControlsBottomLeft = document.getElementById('customControlsBottomLeft')
   map.controls[google.maps.ControlPosition.LEFT_BOTTOM].push(customControlsBottomLeft)
 
   let dataset_url = document.querySelector('body').dataset['dataset']
 
@@ -349,13  363,12 @@ const getIcon  = data => {
 
 const addPoint = (data, index) => {
   datasetData[data.geoguide_id] = data;
-
   let contentString = `
   <div id="infowindow${data.geoguide_id}">
     <h4>Profile</h4>
     <div style="max-height: 25em; overflow-y: auto; padding-bottom: 1em">
     ${Object.keys(data).map(key => {
-      if (data[key] === undefined || key === 'geoguide_id' || data[key] === '') {
       if (data[key] === undefined || key === 'geoguide_id' || data[key] === '' || !datasetVisibleAttrs[key]) {
         return
       }
 
@@ -368,7  381,7 @@ const addPoint = (data, index) => {
       return `<span><strong>${key}</strong>: <code>${value}</code></span><br>`
     }).join('')}
     </div>
-    <button type="button" class="btn btn-default" onclick="GeoGuide.showPotentialPoints(this)">Explore</button>
     <button type="button" class="btn btn-default" onclick="GeoGuide.showPotentialPoints(this)">Highlight</button>
   </div>
   `
 
@@ -499,6  512,9 @@ const isDatasetReady = () => {
           btnElement.removeAttribute('title')
         }
       }
       datasetVisibleAttrs = datasetOptions.attributes.reduce((obj, i) => {
         return { ...obj, [i.description]: i.visible }
       }, {})
     })
   }
 }

diff --git a/geoguide/client/static/src/pageEnvironment/modifiers.js b/geoguide/client/static/src/pageEnvironment/modifiers.js
@@ -46,6  46,14 @@ sizeModifierElement.addEventListener('change', e => {
   sizeModifier = e.target.value
 })
 
 export const onColorModifierChange = f => {
   colorModifierElement.addEventListener('change', f)
 }
 
 export const onSizeModifierChange = f => {
   sizeModifierElement.addEventListener('change', f)
 }
 
 export const getColor = (data, isSelected, isIugaPoint) => {
   let fillColor = normalfillColor
 

diff --git a/geoguide/client/static/src/pageUpload/index.js b/geoguide/client/static/src/pageUpload/index.js
@@ -2,6  2,24 @@ import identifyLatLng from './attribute/identifyLatLng'
 import identifyDatetime from './attribute/identifyDatetime'
 
 import identifyNumberOfRows from './meta/identifyNumberOfRows'
 import identifyFileName from './meta/identifyFileName'
 
 const presentSelection = headers => {
   const container = document.querySelector('#selectionAttrLabel').parentNode
 
   const checkboxesToClean = document.querySelectorAll('.selection-attr')
   if (checkboxesToClean.length > 0) checkboxesToClean.forEach(n => n.remove())
 
   headers.forEach(h => {
     let checkboxAttr = `<div class="selection-attr checkbox">
       <label>
         <input name="selectionAttrInputCheckbox" type="checkbox" value="${h}" checked> ${h}
       </label>
     </div>`
     container.insertAdjacentHTML('beforeend', checkboxAttr)
   })
   container.removeAttribute('hidden')
 }
 
 const normalizeHeaders = headers => {
   return headers.map(header => header.replace(/^"|"$/g, ''))
@@ -10,6  28,7 @@ const normalizeHeaders = headers => {
 const identifyAttributes = (headers, values) => {
   identifyDatetime(headers, values)
   identifyLatLng(headers, values)
   presentSelection(headers)
 }
 
 const identifyMeta = (contents) => {
@@ -33,6  52,7 @@ const readSingleFile = e => {
       identifyAttributes(headers, values)
       identifyMeta(contents)
     }
     identifyFileName(f)
     r.readAsText(f)
   }
 }

diff --git a/geoguide/client/static/src/pageUpload/meta/identifyFileName.js b/geoguide/client/static/src/pageUpload/meta/identifyFileName.js
@@ -0,0  1,7 @@
 const identifyFileName = file => {
   let filename = file.name.split('.')[0].split('-').join(' ')
 	let titleInputElement = document.getElementById('titleInputText')
   titleInputElement.value = filename
 }
 
 export default identifyFileName
diff --git a/geoguide/client/templates/_base.html b/geoguide/client/templates/_base.html
@@ -9,7  9,7 @@
     <meta name="author" content="">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <!-- styles -->
-    <link rel="stylesheet" href="https://bootswatch.com/lumen/bootstrap.min.css">
     <link rel="stylesheet" href="https://bootswatch.com/3/lumen/bootstrap.min.css">
     {% block css %}{% endblock %}
   </head>