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

Sabas merge #105

Merged
merged 126 commits into from
Jan 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
126 commits
Select commit Hold shift + click to select a range
96c8c37
Traduzione interfaccia
sabas Sep 28, 2013
d12ed58
adding CNAME pointer to su.openstreetmap.it
Sep 28, 2013
c7d3750
Merge pull request #1 from cortesimone/gh-pages
sabas Sep 28, 2013
c843b06
Update README.md
sabas Sep 28, 2013
bbf3111
adding extra head space
cortesimone Sep 28, 2013
0a9d096
Merge pull request #2 from cortesimone/gh-pages
sabas Sep 28, 2013
7efd339
s/Fatto/Finito
sabas Sep 28, 2013
c09f75f
Traduzione select2
sabas Sep 28, 2013
b7a5bb6
fix json error
sabas Sep 28, 2013
1b7f7bc
Fix ajax call
sabas Sep 29, 2013
879c028
Update categories.json
sabas Oct 5, 2013
f882a64
Update categories.json
sabas Oct 9, 2013
d09314c
Update categories.json
sabas Oct 9, 2013
5c4ca6f
Adding marker drag options
sabas Oct 9, 2013
d4175c2
Update categories.json
sabas Oct 9, 2013
2bb13c3
Adding a categories box for free text explaination
sabas Oct 13, 2013
124dde1
Tradotte alcune categorie
Oct 13, 2013
f84bfff
Merge pull request #3 from dforsi/gh-pages
sabas Oct 13, 2013
a18df5e
Make fields optional in note text as suggested in ml
sabas Oct 13, 2013
4f2257b
Change geocoding to use jsonp callback, adding Solr testing instance
sabas Oct 14, 2013
67592de
Bump select2, adding payment and rewording social field
sabas Oct 14, 2013
7f01ed7
Add payment to note
sabas Oct 14, 2013
f8cacf8
Update site.js
sabas Oct 14, 2013
124bd6e
Update site.js
sabas Oct 15, 2013
7068807
Adding more info in last panel
sabas Oct 15, 2013
4be6190
Adding analytics code
sabas Oct 22, 2013
04710c8
Update index.html
sabas Oct 23, 2013
79c0771
Update categories.json
sabas Oct 25, 2013
ec1f91a
Update site.css
sabas Oct 25, 2013
0d2a431
Alphabetical order
sabas Oct 29, 2013
3f05969
Add locate control
sabas Dec 8, 2013
4b3e821
Add wheelchair accessibility
sabas Jan 6, 2014
4fefa65
Rewording
sabas Jan 9, 2014
5028e98
Fixing link not appearing when adding a note
sabas Apr 29, 2014
98e9644
Update site.js
sabas Apr 30, 2014
20a9b1f
Merge improvements by alexandre-mbm
sabas May 9, 2014
4f9277c
Add address field
sabas May 11, 2014
e704bde
Removing designated value
sabas May 11, 2014
ee15d0b
Add active notes visualization
sabas May 11, 2014
b35e977
Update categories.json
sabas May 12, 2014
4e75ea1
Overhaul to add simpler internationalization
sabas Oct 27, 2014
cdc006b
Fixes, english locale and favicon
sabas Oct 28, 2014
ee99cf9
rm analytics
sabas May 24, 2015
57bfd50
Fix locales
sabas Dec 12, 2015
455640a
Add language buttons
sabas Dec 12, 2015
9f200f7
add delivery input
fansanelli Mar 22, 2020
d21a67f
Merge pull request #15 from fansanelli/gh-pages
sabas Mar 22, 2020
b4749f1
adjust style
fansanelli Mar 22, 2020
4b43177
Merge pull request #16 from fansanelli/gh-pages
sabas Mar 22, 2020
6a69ae6
tutti i contenuti in HTTPS
fansanelli Mar 31, 2020
6e9b10a
COVID-19 emergency
fansanelli Mar 31, 2020
7f6d0d0
Merge pull request #20 from fansanelli/covid
fansanelli Mar 31, 2020
1700c03
Merge pull request #18 from fansanelli/https
fansanelli Mar 31, 2020
cfcb265
Add Esri layer (#19)
fansanelli Mar 31, 2020
3db498d
lon is undefined
fansanelli Apr 2, 2020
9529ca3
Merge pull request #22 from fansanelli/typo
fansanelli Apr 2, 2020
90d3f67
actually clear value
fansanelli Apr 3, 2020
fd50869
Merge pull request #25 from fansanelli/form-reset
fansanelli Apr 3, 2020
e2ddd69
reimposto i campi input
fansanelli Apr 5, 2020
eda825a
Merge pull request #26 from fansanelli/form-reset-v2
fansanelli Apr 5, 2020
8dc24bf
lngWhitelist
fansanelli Apr 6, 2020
afdf143
Merge pull request #28 from fansanelli/whitelist-lang
fansanelli Apr 6, 2020
e0b5eee
remove duplicated files
fansanelli Apr 6, 2020
da6ec74
Merge pull request #29 from fansanelli/fix-lang
fansanelli Apr 6, 2020
dfdd915
display also tags. suggested by cascafico
fansanelli Apr 26, 2020
cd806c7
Merge pull request #32 from fansanelli/suggest-tags
fansanelli Apr 26, 2020
58e8830
fixes previus commit
fansanelli Apr 26, 2020
41b493d
Merge pull request #33 from fansanelli/suggest-tags
fansanelli Apr 26, 2020
598a5b4
append =yes
fansanelli Apr 26, 2020
07c806d
Merge pull request #34 from fansanelli/suggest-tags
fansanelli Apr 26, 2020
1a5f3a6
suggested by A. Sarretta
fansanelli Apr 26, 2020
bc627a3
Merge pull request #35 from fansanelli/delivery-details
fansanelli Apr 26, 2020
c8694b6
read the correct field
fansanelli Apr 26, 2020
3010495
Merge pull request #36 from fansanelli/delivery-details
fansanelli Apr 26, 2020
6780dac
description
fansanelli Apr 26, 2020
3604e34
Merge pull request #37 from fansanelli/delivery-details
fansanelli Apr 26, 2020
2ed2cba
Grafica aggiornata
naposm Apr 30, 2020
3d6bbab
Modificato ordine dei campi e aggiunte icone (emoji)
naposm Apr 30, 2020
25147ac
Aggiornate dipendenze e risolto problema CSS ai select
naposm May 1, 2020
883fbae
Reso un po' più leggibile
naposm May 1, 2020
cdc5f3c
Aggiunte Twemoji
naposm May 1, 2020
d2b89dd
Aggiunto asporto e indirizzo
naposm May 2, 2020
97dcb81
Migliorato output indirizzo
naposm May 2, 2020
908519f
Update site.js
naposm May 2, 2020
851f5b5
Rimosso ?
naposm May 2, 2020
8653a8f
Modifiche minori all' invio della nota e all' esperienza utente
naposm May 2, 2020
b66fa2e
Aggiunto Open Graph e migliorata UX
naposm May 2, 2020
c72715a
Miglioramento delivery e altri tag
naposm May 4, 2020
f525447
Ora il menù lingua non porta al sito "su.openstreetmap.it"
naposm May 4, 2020
6c1510d
Miglioramenti delivery
naposm May 4, 2020
c741094
Modifiche minori e aggiunta link finali
naposm May 4, 2020
1c21ee4
Modifiche minori
naposm May 5, 2020
ad9f0dc
Modificato bottone e animazione di ricerca
naposm May 5, 2020
09ed7cd
Update js/site.js
fansanelli May 5, 2020
8cfb742
Merge pull request #38 from naposm/gh-pages
fansanelli May 5, 2020
e4f2b54
Miglioramenti reset
naposm May 5, 2020
0a0080f
Nascosto testo in basso (accessibilità)
naposm May 6, 2020
6bc5beb
fix new select2 style - spotted by Damjan Gerl
fansanelli May 6, 2020
dd0b120
Merge pull request #39 from fansanelli/fix-select2-css
fansanelli May 6, 2020
195ce7d
Miglioramenti reset
naposm May 5, 2020
cc576ff
Aggiunto avviso civico non trovato
naposm May 10, 2020
174cfbe
Merge branch 'gh-pages' of https://github.com/naposm/suosm into gh-pages
naposm May 10, 2020
1ac8309
Update site.js
naposm May 10, 2020
b573e26
Modificato errore
naposm May 10, 2020
9d3124d
Delete select2.css
fansanelli May 12, 2020
f02efc4
Risolti errori
naposm May 12, 2020
39c5cc7
Risolto bug
naposm May 12, 2020
70af32d
Risolti problemi
naposm May 13, 2020
5d300bf
Merge remote branch 'origin/gh-pages'
naposm May 13, 2020
a620236
Merge remote branch 'origin/gh-pages'
naposm May 13, 2020
4730def
Merge remote branch 'origin/gh-pages'
naposm May 13, 2020
15c15c7
Apply suggestions from code review
fansanelli May 13, 2020
04716d0
Merge pull request #40 from naposm/gh-pages
fansanelli May 13, 2020
d68c72f
New website introduction/description
Aury88 Apr 18, 2021
22bde75
improved the service appeal
Aury88 Apr 18, 2021
341f7b5
Merge pull request #44 from Aury88/patch-1
sabas Apr 18, 2021
7283951
Update translation.json
Mannivu Dec 15, 2021
8d5edc0
Merge pull request #45 from Mannivu/patch-1
sabas Dec 15, 2021
f012688
inital sabas merge
ArcaneDots Dec 17, 2022
fcf7b09
working merge
ArcaneDots Dec 22, 2022
8e0d81e
minor html and translation fixes
ArcaneDots Jan 10, 2023
8da3af6
fixed broken link for twemoji source
ArcaneDots Jan 10, 2023
d285397
fixed bad readme merge
ArcaneDots Jan 10, 2023
6035cd5
Cleaned up readme
ArcaneDots Jan 12, 2023
c9ad454
fix and simplify note generation
ArcaneDots Jan 13, 2023
a325138
fix CNAME and file attributes
ArcaneDots Jan 16, 2023
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
20 changes: 17 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# [onosm.org](https://onosm.org/)
# OnOSM

OnOSM helps business owners provide structured data about their shop. The result is written to an anonymous [OpenStreetMap Note](https://wiki.openstreetmap.org/wiki/Notes). See [recently created notes](https://ent8r.github.io/NotesReview/?query=submitted%20note%20from%20a%20business).
An easy way to get a business on to OpenStreetMap.

## Description

OnOSM helps business owners provide structured data about their shop. The result is written to an anonymous [Note](https://wiki.openstreetmap.org/wiki/Notes) that is placed on the map. To see examples previously created notes, take a look at [recently created notes](https://ent8r.github.io/NotesReview/?query=submitted%20note%20from%20a%20business) using NoteReview, another community developed application.

## Available languages

Application defaults to displaying text in British English. Alternate translations are also available. They can be selected at anytime using the drop-down at the top of the page.

## Contributing

Expand All @@ -11,6 +19,12 @@ General notes
* Prefer 4 space soft tab in javascript
* For UI changes, don't forget to include a screenshot or two in the pull request

## See Also
## Wiki

* [onosm.org on the OpenStreetMap wiki](https://wiki.openstreetmap.org/wiki/Onosm.org)

## Licenses

- Twemoji emojis by Twitter licensed under [CC-BY 4.0](https://github.com/twitter/twemoji/blob/master/LICENSE-GRAPHICS)
- Twemoji awesome licensed under [MIT](https://github.com/SebastianAigner/twemoji-amazing)

112 changes: 112 additions & 0 deletions active.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<!DOCTYPE html>
<html lang="it">
<title>Active OnOSM Notes</title>
<link rel="stylesheet" href="https://necolas.github.io/normalize.css/2.1.3/normalize.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/leaflet.css" />
<script src="https://unpkg.com/[email protected]/dist/leaflet.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<link rel="stylesheet" href="css/Leaflet.EditInOSM.css" />
<script src="js/Leaflet.EditInOSM.js"></script>

<script src="js/leaflet-hash.js"></script>

<script type="text/javascript">
//https://code.google.com/p/microajax/
function microAjax(B,A){this.bindFunction=function(E,D){return function(){return E.apply(D,[D])}};this.stateChange=function(D){if(this.request.readyState==4){this.callbackFunction(this.request.responseText)}};this.getRequest=function(){if(window.ActiveXObject){return new ActiveXObject("Microsoft.XMLHTTP")}else{if(window.XMLHttpRequest){return new XMLHttpRequest()}}return false};this.postBody=(arguments[2]||"");this.callbackFunction=A;this.url=B;this.request=this.getRequest();if(this.request){var C=this.request;C.onreadystatechange=this.bindFunction(this.stateChange,this);if(this.postBody!==""){C.open("POST",B,true);C.setRequestHeader("X-Requested-With","XMLHttpRequest"); C.setRequestHeader("Content-type","application/x-www-form-urlencoded");C.setRequestHeader("Connection","close")}else{C.open("GET",B,true)}C.send(this.postBody)}};
</script>
<link href='https://fonts.googleapis.com/css?family=Ledger&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<style>
body{
font-family:Ledger,serif;
}
#mapdiv{
position:fixed;
top:0;
right:0;
width:75%;
bottom:0;
}
#text{
width:25%;
}

@media all and (max-width:600px)
{
#text{
height:25%;
width:100%;
overflow-y:scroll;
}
#mapdiv{
position:fixed;
top:auto;
left:0;
right:0;
height:75%;
width:100%;
bottom:0;
}
}
</style>
</head>
<body>
<div id="text">

</div>
<div id="mapdiv"></div>
<script type="text/javascript">
var lat=41.992,
lon=12.393,
zoom=5;
var osm = new L.TileLayer('https://{s}.tile.osm.org/{z}/{x}/{y}.png', {maxZoom: 19, attribution: 'Map Data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});
var cyclemap = new L.TileLayer('https://{s}.tile.opencyclemap.org/cycle/{z}/{x}/{y}.png', {maxZoom: 18, attribution: 'Map Data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});
var mapquest = new L.TileLayer('https://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png', {subdomains: '1234', maxZoom: 18, attribution: 'Map Data &copy; <a href="https://openstreetmap.org">OpenStreetMap</a> contributors'});

var map = new L.Map('mapdiv', {
editInOSMControl: true,
editInOSMControlOptions: {
position: "topright"
},
center: new L.LatLng(lat, lon),
zoom: zoom,
layers: [osm]
});

var baseMaps = {
"Mapnik": osm,
"OpenCycleMap": cyclemap,
"Mapquest Open": mapquest
};
L.control.layers(baseMaps).addTo(map);

var hash = new L.Hash(map);

var ico=L.icon({iconUrl:'img/Open_note_marker.png', iconSize:[25,40],iconAnchor:[12,40],popupAnchor: [0, -40] });

function loadLayer(url)
{
var geojson = L.geoJson(url,{
onEachFeature:function onEachFeature(feature, layer) {
if (feature.properties && feature.properties.id) {
var url="https://www.openstreetmap.org/note/"+feature.properties.id;
layer.bindPopup("URL: <a href='"+url+"'>"+url+"</a><br/>Data: "+feature.properties.date_created);
}
},
pointToLayer: function (feature, latlng) {
var marker=L.marker(latlng, {icon:ico});
return marker;
}
});

map.addLayer(geojson);
}

var httpurl="https://api.openstreetmap.org/api/0.6/notes/search.json?q=su.openstreetmap.it&closed=0&limit=100";
microAjax(httpurl,function (res) {
var feat=JSON.parse(res);
loadLayer(feat);
} );
</script>
</body>
</html>
34 changes: 34 additions & 0 deletions css/L.Control.Locate.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/* Compatible with Leaflet 0.6 */

.leaflet-touch .leaflet-bar-part-single {
-webkit-border-radius: 7px 7px 7px 7px;
border-radius: 7px 7px 7px 7px;
border-bottom: none;
}

.leaflet-control-locate a {
background-image: url(locate_alt.png);
background-position: -2px -2px;
}

.leaflet-touch .leaflet-control-locate a {
background-image: url(locate_touch_alt.png);
}

.leaflet-control-locate.requesting a {
background-image: url(spinner.gif);
background-position: 50% 50%;
}

.leaflet-control-locate.active a {
background-position: -32px -2px;
}

.leaflet-control-locate.active.following a {
background-position: -62px -2px;
}

.leaflet-touch .leaflet-control-locate {
box-shadow: none;
border: 4px solid rgba(0,0,0,0.3);
}
12 changes: 12 additions & 0 deletions css/L.Control.Locate.ie.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* Conditional stylesheet for IE. */
.leaflet-control-locate {
border: 3px solid #999;
}

.leaflet-control-locate a {
background-color: #eee;
}

.leaflet-control-locate a:hover {
background-color: #fff;
}
43 changes: 43 additions & 0 deletions css/Leaflet.EditInOSM.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.leaflet-control-edit-in-osm {
background: none repeat scroll 0 0 #F8F8F9;
border: 1px solid #888888;
border-radius: 5px 5px 5px 5px;
box-shadow: 0 0 8px rgba(0, 0, 0, 0.4);
}
.leaflet-control-edit-in-osm .leaflet-control-edit-in-osm-toggle {
background-position: 50% 50%;
background-repeat: no-repeat;
height: 36px;
width: 36px;
display: block;
}
.leaflet-control-edit-in-osm .leaflet-control-edit-in-osm-toggle {
background-image: url("./edit-in-osm.png");
}
.leaflet-control-edit-in-osm .osm-editor + .osm-editor {
border-left: 1px solid black;
}
.leaflet-control-edit-in-osm a.osm-editor {
display: none;
height: 36px;
min-width: 36px;
text-align: center;
line-height: 36px;
color: #333;
padding: 0 5px;
text-decoration: none;
font-family: sans-serif;
}
.leaflet-control-edit-in-osm:hover a.osm-editor {
display: inline-block;
}
a.osm-editor:hover {
box-shadow: 0 0 2px 0 black inset;
}
.leaflet-control-edit-in-osm:hover .leaflet-control-edit-in-osm-toggle {
display: none;
}

.leaflet-control-edit-hidden {
display: none;
}
Binary file added css/edit-in-osm.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/locate_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/locate_touch_alt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/select2-spinner.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/select2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/select2x2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added css/spinner.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading