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

Overlay on Maps - Prototype #21

Open
wants to merge 53 commits into
base: 7.2-devel
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
18c2d68
Single geojson file, with popup showing info.
Jun 21, 2020
82df989
Modified to include images in the popups
Jun 22, 2020
652d83d
New GeoJSON Files added, overlays work with multipe geojson files, im…
Jun 22, 2020
0021595
Modifications to styled markers
Jun 22, 2020
d64a988
icon source through a variable and trying to check function call order
Jun 29, 2020
66c67e7
icon image working process
Jul 1, 2020
3098462
Phase 1 changes with bug: undefined popups: will be removed in the ne…
Jul 2, 2020
6071466
undefined popup fixed
Jul 2, 2020
04ab155
Script added
Jul 10, 2020
7112d3d
scripts modified
Jul 11, 2020
2c9bc34
scripts modified with geojson outpdef main():
Jul 11, 2020
8be8ddb
finalpythonscript - 1st edit - added
Jul 12, 2020
4f05f42
added property variable for marker image
Jul 13, 2020
bf42965
Used argparse
Jul 15, 2020
ddc7769
query template, popup description, marker icon,fixed labels
Jul 17, 2020
257bd26
modified
Jul 17, 2020
b9107be
Modified
Jul 17, 2020
303861c
added hospital query and fixes
Jul 19, 2020
3b25478
Modified Script and cleaning
Jul 19, 2020
15c4ad4
query files renamed
Jul 20, 2020
91b82a5
Modified:
Jul 20, 2020
2d278d1
Modified
Jul 20, 2020
382d926
Modified
siriuswapnil Jul 20, 2020
e441ca7
modified
Jul 20, 2020
dbfdf0d
Sample substitution using Python string template
Jul 25, 2020
2d697f2
variable sub syntax at l14 main py file
Jul 25, 2020
fb643d9
Changed to PEP-8 styling
Jul 27, 2020
7a031e5
Implemented feature Types via dictionary
Jul 27, 2020
be5bf3f
Modified up.sh
Jul 27, 2020
aedd92e
Modified
Jul 27, 2020
b805386
Added markers
Jul 27, 2020
af195e3
Modified
Jul 28, 2020
92ff8f5
Fixed
Jul 28, 2020
d3fb5ce
Fixed
Jul 28, 2020
4b394f5
Modified
Jul 28, 2020
a1f35a6
modified
Jul 28, 2020
2617245
modified
Jul 28, 2020
38a4b2a
Modified with catalog entry
Jul 29, 2020
9d4684f
Merge branch '7.2-devel-osm-working' of https://github.com/siriuswapn…
Jul 29, 2020
a09ac75
Changed catalog location
Jul 29, 2020
c71e619
Validation
Jul 31, 2020
8d3307e
query limiting
Jul 31, 2020
81e571d
trying for user_catalog
Jul 31, 2020
a8970f1
Long val fixed
Jul 31, 2020
8761476
Changes
Jul 31, 2020
a442d5b
Modified
Aug 1, 2020
86f10a7
modified argparse help
Aug 4, 2020
f8023be
Added admin panel overlay install template
Aug 11, 2020
32077d7
Modified
Aug 11, 2020
291e1e1
Modified
Aug 22, 2020
29ad66a
Admin panel query selector
Aug 23, 2020
db6e136
The following features of Phase 3 were added:
Aug 26, 2020
63889c6
Added link to Final Report for GSoC
siriuswapnil Aug 29, 2020
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
7 changes: 7 additions & 0 deletions GSoC-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
The project report for Google Summer of Code 2020 is at :

## https://www.mediawiki.org/wiki/User:Siriuswapnil/gsoc_final_report

Please have a look.

Thanks!
36 changes: 18 additions & 18 deletions osm-source/viewer/assets/fonts.css
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
font-family: 'Noto Sans';
font-style: normal;
font-weight: 400;
src: url('/common/fonts/noto-sans-v8-latin-regular.eot'); /* IE9 Compat Modes */
src: url('./noto-sans-v8-latin-regular.eot'); /* IE9 Compat Modes */
src: local('Noto Sans'), local('NotoSans'),
url('/common/fonts/noto-sans-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/common/fonts/noto-sans-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('/common/fonts/noto-sans-v8-latin-regular.svg#NotoSans') format('svg'); /* Legacy iOS */
url('./noto-sans-v8-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./noto-sans-v8-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('./noto-sans-v8-latin-regular.woff') format('woff'), /* Modern Browsers */
url('./noto-sans-v8-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('./noto-sans-v8-latin-regular.svg#NotoSans') format('svg'); /* Legacy iOS */
}
/* noto-sans-italic - latin */
@font-face {
font-family: 'Noto Sans';
font-style: italic;
font-weight: 400;
src: url('/common/fonts/noto-sans-v8-latin-italic.eot'); /* IE9 Compat Modes */
src: url('./noto-sans-v8-latin-italic.eot'); /* IE9 Compat Modes */
src: local('Noto Sans Italic'), local('NotoSans-Italic'),
url('/common/fonts/noto-sans-v8-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/common/fonts/noto-sans-v8-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-italic.woff') format('woff'), /* Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
url('/common/fonts/noto-sans-v8-latin-italic.svg#NotoSans') format('svg'); /* Legacy iOS */
url('./noto-sans-v8-latin-italic.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./noto-sans-v8-latin-italic.woff2') format('woff2'), /* Super Modern Browsers */
url('./noto-sans-v8-latin-italic.woff') format('woff'), /* Modern Browsers */
url('./noto-sans-v8-latin-italic.ttf') format('truetype'), /* Safari, Android, iOS */
url('./noto-sans-v8-latin-italic.svg#NotoSans') format('svg'); /* Legacy iOS */
}
/* noto-sans-700 - latin */
@font-face {
font-family: 'Noto Sans';
font-style: normal;
font-weight: 700;
src: url('/common/fonts/noto-sans-v8-latin-700.eot'); /* IE9 Compat Modes */
src: url('./noto-sans-v8-latin-700.eot'); /* IE9 Compat Modes */
src: local('Noto Sans Bold'), local('NotoSans-Bold'),
url('/common/fonts/noto-sans-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('/common/fonts/noto-sans-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-700.woff') format('woff'), /* Modern Browsers */
url('/common/fonts/noto-sans-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('/common/fonts/noto-sans-v8-latin-700.svg#NotoSans') format('svg'); /* Legacy iOS */
url('./noto-sans-v8-latin-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('./noto-sans-v8-latin-700.woff2') format('woff2'), /* Super Modern Browsers */
url('./noto-sans-v8-latin-700.woff') format('woff'), /* Modern Browsers */
url('./noto-sans-v8-latin-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('./noto-sans-v8-latin-700.svg#NotoSans') format('svg'); /* Legacy iOS */
}
body {
font-family: 'Open Sans', sans-serif;
Expand Down
39 changes: 39 additions & 0 deletions osm-source/viewer/assets/wikidata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"wikidata" : {
"hospital" :{
"query_file_name" : "hospitalquery.sparql",
"feature_icon_name" : "hospital.png",
"query_title" : "Hospital"
},
"airport" : {
"query_file_name" : "airport.sparql",
"feature_icon_name" : "airport.png",
"query_title" : "Airport"
},
"bus-station" : {
"query_file_name" : "bustation.sparql",
"feature_icon_name" : "bus-station.png",
"query_title" : "Bus Station"
},
"library" : {
"query_file_name" : "library.sparql",
"feature_icon_name" : "library.png",
"query_title" : "Library"
},
"national-park" : {
"query_file_name" : "nationalparks.sparql",
"feature_icon_name" : "national-park.png",
"query_title" : "National Park"
},
"railway-station" : {
"query_file_name" : "railwaystation.sparql",
"feature_icon_name" : "railway-station.png",
"query_title" : "Railway Station"
},
"school" : {
"query_file_name" : "schoolsnearby.sparql",
"feature_icon_name" : "school.png",
"query_title" : "School"
}
}
}
14 changes: 11 additions & 3 deletions osm-source/viewer/build/index.html
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<body>
<div class="well col-md-5">
<input id="search" type="text" class="col-md-6 form-control" placeholder="Search cities..." autocomplete="off" />
</div>
</div>
<div id="info-overlay"></div>
<div id="layerswitcher"></div>
<div id="picture" style='display:none'>
Expand All @@ -60,7 +60,7 @@

<div id="map-container"></div>
<div id="map" class="map"></div>
<div id="popup" class="ol-popup" ondragover='dragover_handler(event)' ondrop='drop_handler(event)'>
<!-- <div id="popup" class="ol-popup" ondragover='dragover_handler(event)' ondrop='drop_handler(event)'>
<form>
<a href="#" id="popup-closer" class="ol-popup-closer"></a>
<div><input id="popup-title" type="text" size="50" placeholder="Title"></textbox></div>
Expand All @@ -74,7 +74,13 @@
<div id="popup-delete" class='pbut'><button id='deletinline-block' type="button">Delete Point</button></div>
</div>
</form>
</div> -->
<!--for markup overlay-->
<div id="popup" class="ol-popup">
<a href="#" id="popup-closer" class="ol-popup-closer"></a>
<div id="popup-content"></div>
</div>
<!--End-->
<input type="file" id="import-json" style="display:none">
<input type="file" id="import-jpeg" style="display:none">

Expand All @@ -86,6 +92,8 @@
<option value="metric" selected>metric</option>
</select>
<button id='home'>Home</button>
<script src="main.js"></script></body>
<script src="main.js"></script>
<script src="overlay.js"></script>
</body>
</html>

Loading