[tarent-useful-scripts SCM] {mirkarte} branch master updated. 2dde529e86aa2563c148f0f5b5b38710d9046826

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Jun 16 16:43:31 CEST 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MirKarte source code repository".

The branch, master has been updated
       via  2dde529e86aa2563c148f0f5b5b38710d9046826 (commit)
       via  ec9b94b50648aa8aaf07b2f17e32ffc3243a451c (commit)
      from  f66f4090f723807e723d2f90ebe464077694051f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2dde529e86aa2563c148f0f5b5b38710d9046826
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Mon Jun 16 16:42:36 2014 +0200

    add README and LICENCE for the Beta version of the MirKarte v1

commit ec9b94b50648aa8aaf07b2f17e32ffc3243a451c
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Mon Jun 16 16:37:25 2014 +0200

    move derived icons into separate dir

-----------------------------------------------------------------------

Summary of changes:
 LICENCE                             |  115 +++++++++++++++++++++++++++++++++++
 README                              |   25 ++++++++
 {leaflet => img}/marker-icon-2x.png |  Bin 3622 -> 3622 bytes
 {leaflet => img}/marker-icon.png    |  Bin 1620 -> 1620 bytes
 {leaflet => img}/marker-shadow.png  |  Bin 797 -> 797 bytes
 mirkarte.js                         |    6 +-
 6 files changed, 143 insertions(+), 3 deletions(-)
 create mode 100644 LICENCE
 create mode 100644 README
 rename {leaflet => img}/marker-icon-2x.png (100%)
 rename {leaflet => img}/marker-icon.png (100%)
 rename {leaflet => img}/marker-shadow.png (100%)

diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..19a0c37
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,115 @@
+MirKarte itself is covered by The MirOS Licence:
+
+# Copyright © 2014
+#	Thorsten “mirabilos” Glaser <tg at mirbsd.org>
+#
+# Provided that these terms and disclaimer and all copyright notices
+# are retained or reproduced in an accompanying document, permission
+# is granted to deal in this work without restriction, including un‐
+# limited rights to use, publicly perform, distribute, sell, modify,
+# merge, give away, or sublicence.
+#
+# This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
+# the utmost extent permitted by applicable law, neither express nor
+# implied; without malicious intent or gross negligence. In no event
+# may a licensor, author or contributor be held liable for indirect,
+# direct, other damage, loss, or other issues arising in any way out
+# of dealing in the work, even if advised of the possibility of such
+# damage or existence of a defect, except proven that it results out
+# of said person’s immediate fault when using the work as intended.
+
+MirKarte makes use of the Prototype JavaScript framework,
+which comes under an MIT licence:
+
+# Copyright (C) 2005-2008 Sam Stephenson <sam at conio.net>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+MirKarte makes use of the Leaflet mapping framework
+under a 2-clause BSD-style licence:
+
+# Copyright (c) 2010-2013, Vladimir Agafonkin
+# Copyright (c) 2010-2011, CloudMade
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+#
+#    2. Redistributions in binary form must reproduce the above copyright
+#       notice, this list of conditions and the following disclaimer in the
+#       documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+MirKarte uses zip.js under a 3-clause BSD-style licence:
+
+# Copyright (c) 2013 Gildas Lormeau. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+#    this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+#    this list of conditions and the following disclaimer in the documentation
+#    and/or other materials provided with the distribution.
+#
+# 3. The names of the authors may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JCRAFT,
+# INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+MirKarte currently uses togeojson for GPX import, whose licence tells us,
+in no uncertain terms, to do whatever we want to.
+
+The img/ subdirectory contains three marker icons that are derived
+from those provided with Leaflet and only have the colour changed
+programmatically, using The GIMP.
+
+The tc/ subdirectory contains icons that are part of the TerraCaching
+website and are © Terra Interactive, LLC. These icons are proprietary
+and may not be used by anyone without express permission of them.
+
+The MirKarte accesses various online tile services. These are the
+only external accesses this page does, but they may have privacy
+implications as one tile layer is always loaded by default upon
+page access. Furthermore, the tile and WMS services have terms of
+use by themselves, which you (the MirKarte user) are required to
+adhere to, and which are not covered by me (the developer of the
+software known as MirKarte).
diff --git a/README b/README
new file mode 100644
index 0000000..65b2e14
--- /dev/null
+++ b/README
@@ -0,0 +1,25 @@
+MirKarte
+────────
+
+This is the beta version of an experimental map application.
+It is designed to show maps from various tile sources (of which
+quite a number are already included), geocaches and similar
+waypoints, and have advanced abilities (display coordinates
+under the cursor, draw lines, draw circles around points with
+a given equidistance, etc).
+
+The current version can locally (fully client-side) import
+GPX files from TerraCaching (zipped or plain) and display
+the caches on the map. Support for other geocaching platforms,
+geodashing, etc. may be added later.
+
+Some advanced map functionality is not yet implemented.
+
+This is a beta. It may break horribly and I will not be held
+responsible.
+
+If you use this, you must check the terms of use of the
+various tile or WMS services yourself.
+
+VCS repository:
+https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=useful-scripts/mirkarte.git
diff --git a/leaflet/marker-icon-2x.png b/img/marker-icon-2x.png
similarity index 100%
rename from leaflet/marker-icon-2x.png
rename to img/marker-icon-2x.png
diff --git a/leaflet/marker-icon.png b/img/marker-icon.png
similarity index 100%
rename from leaflet/marker-icon.png
rename to img/marker-icon.png
diff --git a/leaflet/marker-shadow.png b/img/marker-shadow.png
similarity index 100%
rename from leaflet/marker-shadow.png
rename to img/marker-shadow.png
diff --git a/mirkarte.js b/mirkarte.js
index 6d2cd05..0088ded 100644
--- a/mirkarte.js
+++ b/mirkarte.js
@@ -266,9 +266,9 @@ if (typeof(window.onhashchange) !== "undefined" &&
 	    })();
 }
 var marker_icon = L.icon({
-	"iconUrl": "leaflet/marker-icon.png",
-	"iconRetinaUrl": "leaflet/marker-icon-2x.png",
-	"shadowUrl": "leaflet/marker-shadow.png",
+	"iconUrl": "img/marker-icon.png",
+	"iconRetinaUrl": "img/marker-icon-2x.png",
+	"shadowUrl": "img/marker-shadow.png",
 
 	/* copied from L.Icon.Default */
 	iconSize: [25, 41],


hooks/post-receive
-- 
MirKarte source code repository
(Evolvis project useful-scripts repository mirkarte)


More information about the useful-scripts-commits mailing list