diff --git a/myproject/db.sqlite3 b/myproject/db.sqlite3 index f48c04f..28204eb 100644 Binary files a/myproject/db.sqlite3 and b/myproject/db.sqlite3 differ diff --git a/myproject/myapp/__pycache__/admin.cpython-36.pyc b/myproject/myapp/__pycache__/admin.cpython-36.pyc index 1248477..dc9ec83 100644 Binary files a/myproject/myapp/__pycache__/admin.cpython-36.pyc and b/myproject/myapp/__pycache__/admin.cpython-36.pyc differ diff --git a/myproject/myapp/admin.py b/myproject/myapp/admin.py index 2c25380..da81ab2 100644 --- a/myproject/myapp/admin.py +++ b/myproject/myapp/admin.py @@ -1,5 +1,6 @@ # Register your models here. from django.contrib import admin -from myapp.models import UserProfileInfo, User +from myapp.models import * # Register your models here. -admin.site.register(UserProfileInfo) \ No newline at end of file +admin.site.register(UserProfileInfo) +admin.site.register(satelliteMetadataFiles) \ No newline at end of file diff --git a/myproject/myapp/templates/home.html b/myproject/myapp/templates/home.html index 859659a..e427ecc 100644 --- a/myproject/myapp/templates/home.html +++ b/myproject/myapp/templates/home.html @@ -7,21 +7,28 @@ - + + - + + + - + - - - + + + + + + + - + \ No newline at end of file diff --git a/myproject/static/js/calc.js b/myproject/static/js/calc.js index 9382a76..1035b3e 100644 --- a/myproject/static/js/calc.js +++ b/myproject/static/js/calc.js @@ -1,4 +1,13 @@ -function addChar(input, character) { +//================================================== changes ====================================================== +function clearCalcScreen() +{ + document.getElementById('display').value=''; +} +//================================================== changes ====================================================== +function addChar(character) { //================================================== changes ====================================================== + //================================================== changes ====================================================== + let input = document.getElementById('display'); + //================================================== changes ====================================================== if(input.value == null || input.value == "enter") input.value = character else{ @@ -9,53 +18,70 @@ function addChar(input, character) { } } -function deleteChar(input) { +function deleteChar() {//================================================== changes ====================================================== + //================================================== changes ====================================================== + let input = document.getElementById('display'); + //================================================== changes ====================================================== input.value = input.value.substring(0, input.value.length - 1) } -function cos(input) { +function cos() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='cos(' else input.value =input.value +'cos(' } -function sin(input) { +function sin() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='sin(' else input.value =input.value +'sin(' } -function tan(input) { +function tan() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='tan(' else input.value =input.value +'tan(' } -function sqrt(input) { +function sqrt() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='sqrt(' else input.value =input.value +'sqrt(' } -function log(input) { +function log() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='log(' else input.value =input.value +'log(' } -function exp(input) { +function exp() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='exp(' else input.value =input.value +'exp(' } -function power(input) { +function power() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='pow(' else @@ -64,28 +90,37 @@ function power(input) { -function pi(input){ +function pi() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='PI' else input.value =input.value +'PI'} -function ceil(input){ +function ceil() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='ceil(' else input.value =input.value +'ceil('} -function floor(input){ +function floor() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='floor(' else input.value =input.value +'floor('} -function percent(input){ - input.value=input.value + '%(';} +function percent() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); + input.value=input.value + '%('; +} diff --git a/myproject/static/js/script.js b/myproject/static/js/script.js index e1e2b9e..ddd0217 100644 --- a/myproject/static/js/script.js +++ b/myproject/static/js/script.js @@ -1,3 +1,7 @@ +//================================================== changes ====================================================== +let map = L.map("map").setView([39.8, -98.5], 6); +//================================================== changes ====================================================== + /*jshint esversion: 6 */ /** * This function is used to get cookie so that csrf token can be set while sending request to backend @@ -290,7 +294,7 @@ function getIndices(){ function initializeLeaflet() { // initialize the map - let map = L.map("map").setView([39.8, -98.5], 6); + let CDB_URL = 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'; let thirdLayer = new L.tileLayer(CDB_URL); let MyBingMapsKey = "ApDp98sLLH6Lggj-ExrPosLg8IDo0exkQYMu6qU41XgOMheh1NDWyd1HHzyVbny9"; @@ -304,7 +308,7 @@ function initializeLeaflet() }; L.control.layers(baseLayers).addTo(map); - let searchControl = new L.esri.Controls.Geosearch().addTo(map); + // let searchControl = new L.esri.Controls.Geosearch().addTo(map); map.pm.addControls({ position: "topleft", @@ -451,4 +455,57 @@ function initializeLeaflet() function onLayerAdd(e){ radlayerGroup.bringToFront(); } -} \ No newline at end of file +} + + +//================================================== changes ====================================================== + +function showFootprints() +{ + footPrintsArr = [] + sendRequest("/myapp/getFootprints/","GET") + .then(function (response) { + response = JSON.parse(response); + console.log(response); + var arr = response.dict; + var exteriorStyle = { + "color": 'black', + "weight": 0, + "fillOpacity": 0.05 + }; + for(let i=0; i