[Python-modules-commits] [gmplot] 01/06: Import gmplot_1.1.1.orig.tar.gz

[Sandro Tosi]

This is an automated email from the git hooks/post-receive script.

morph pushed a commit to branch master
in repository gmplot.

commit fbbb11399037daae4ccf7118a67ee12ddb5af18e
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Oct 2 13:47:03 2016 -0400

    Import gmplot_1.1.1.orig.tar.gz
---
 PKG-INFO                 |  2 +-
 gmplot.egg-info/PKG-INFO |  2 +-
 gmplot/__init__.py       |  2 +-
 gmplot/gmplot.py         | 16 +++++++---------
 setup.py                 |  2 +-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 3a74960..823f21c 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: gmplot
-Version: 1.1.0
+Version: 1.1.1
 Summary: Provide a matplotlib like interface to plotting data with Google Maps
 Home-page: https://github.com/vgm64/gmplot
 Author: Michael Woods
diff --git a/gmplot.egg-info/PKG-INFO b/gmplot.egg-info/PKG-INFO
index 3a74960..823f21c 100644
--- a/gmplot.egg-info/PKG-INFO
+++ b/gmplot.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: gmplot
-Version: 1.1.0
+Version: 1.1.1
 Summary: Provide a matplotlib like interface to plotting data with Google Maps
 Home-page: https://github.com/vgm64/gmplot
 Author: Michael Woods
diff --git a/gmplot/__init__.py b/gmplot/__init__.py
index 52216be..0acab2a 100644
--- a/gmplot/__init__.py
+++ b/gmplot/__init__.py
@@ -1 +1 @@
-from gmplot import GoogleMapPlotter
\ No newline at end of file
+from .gmplot import GoogleMapPlotter
diff --git a/gmplot/gmplot.py b/gmplot/gmplot.py
index cb80186..ab66e9f 100644
--- a/gmplot/gmplot.py
+++ b/gmplot/gmplot.py
@@ -3,7 +3,7 @@ import requests
 import json
 import os
 
-from color_dicts import mpl_color_map, html_color_codes
+from .color_dicts import mpl_color_map, html_color_codes
 
 
 def safe_iter(var):
@@ -45,12 +45,12 @@ class GoogleMapPlotter(object):
     def grid(self, slat, elat, latin, slng, elng, lngin):
         self.gridsetting = [slat, elat, latin, slng, elng, lngin]
 
-    def marker(self, lat, lng, color='#FF0000', c=None):
+    def marker(self, lat, lng, color='#FF0000', c=None, title="no implementation"):
         if c:
             color = c
         color = self.color_dict.get(color, color)
         color = self.html_color_codes.get(color, color)
-        self.points.append((lat, lng, color[1:]))
+        self.points.append((lat, lng, color[1:], title))
 
     def scatter(self, lats, lngs, color=None, size=None, marker=True, c=None, s=None, **kwargs):
         color = color or c
@@ -102,7 +102,7 @@ class GoogleMapPlotter(object):
                             settings["face_color"]
 
         # Need to replace "plum" with "#DDA0DD" and "c" with "#00FFFF" (cyan).
-        for key, color in settings.iteritems():
+        for key, color in settings.items():
             if 'color' in key:
                 color = self.color_dict.get(color, color)
                 color = self.html_color_codes.get(color, color)
@@ -232,7 +232,7 @@ class GoogleMapPlotter(object):
 
     def write_points(self, f):
         for point in self.points:
-            self.write_point(f, point[0], point[1], point[2])
+            self.write_point(f, point[0], point[1], point[2], point[3])
 
     def get_cycle(self, lat, lng, rad):
         # unit of radius: meter
@@ -274,13 +274,13 @@ class GoogleMapPlotter(object):
             '\t\tvar map = new google.maps.Map(document.getElementById("map_canvas"), myOptions);\n')
         f.write('\n')
 
-    def write_point(self, f, lat, lon, color):
+    def write_point(self, f, lat, lon, color, title):
         f.write('\t\tvar latlng = new google.maps.LatLng(%f, %f);\n' %
                 (lat, lon))
         f.write('\t\tvar img = new google.maps.MarkerImage(\'%s\');\n' %
                 (self.coloricon % color))
         f.write('\t\tvar marker = new google.maps.Marker({\n')
-        f.write('\t\ttitle: "no implimentation",\n')
+        f.write('\t\ttitle: "%s",\n' % title)
         f.write('\t\ticon: img,\n')
         f.write('\t\tposition: latlng\n')
         f.write('\t\t});\n')
@@ -390,5 +390,3 @@ if __name__ == "__main__":
                     [-122.142048, -122.141275, -122.140503, -122.139688, -122.138872, -122.138078, -122.137241, -122.136405, -122.135568, -122.134731, -122.133894, -122.133057, -122.13222, -122.131383, -122.130557, -122.129999])
     mymap.scatter(scatter_path[0], scatter_path[1], c='r', marker=True)
     mymap.draw('./mymap.html')
-
-
diff --git a/setup.py b/setup.py
index bef5a6b..9addcaf 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 import os
 from setuptools import setup, find_packages
 
-__version__ = '1.1.0'
+__version__ = '1.1.1'
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/gmplot.git