Fix point inside box (#17)

* Update LICENSE copyright year * Fix a bug when selecting stations in a rectangular region
seisman · Feb 19, 2019 · 7663912 · 7663912
1 parent e3761be
commit 7663912
Show file tree

Hide file tree

Showing 26 changed files with 104 additions and 90 deletions.
diff --git a/Changelog.rst b/Changelog.rst
@@ -1,6 +1,9 @@
 Changelog
 =========
 
+0.5.2 (2019-02-19):
+ - Fix selecting stations in a rectangular region (#17).
+
 0.5.1 (2018-12-08):
  - Fix typo from longtitude to longitude.
 

diff --git a/HinetPy/__init__.py b/HinetPy/__init__.py
@@ -18,7 +18,7 @@
 """
 
 __title__ = "HinetPy"
-__version__ = "0.5.1"
+__version__ = "0.5.2"
 __author__ = "Dongdong Tian"
 __license__ = "MIT"
 

diff --git a/HinetPy/client.py b/HinetPy/client.py
@@ -135,10 +135,10 @@ def doctor(self):
         """ Doctor does some checks.
 
         >>> client.doctor()
-        [2017-01-01 00:00:00] INFO: You're using the latest release (v0.5.0).
-        [2017-01-01 00:00:00] INFO: Hi-net web service is NOT updated.
-        [2017-01-01 00:00:00] INFO: catwin32: /home/user/bin/catwin32.
-        [2017-01-01 00:00:00] INFO: win2sac_32: /home/user/bin/win2sac_32.
+        [2019-02-19 00:00:00] INFO: You're using the latest release (v0.5.2).
+        [2019-02-19 00:00:00] INFO: Hi-net web service is NOT updated.
+        [2019-02-19 00:00:00] INFO: catwin32: /home/user/bin/catwin32.
+        [2019-02-19 00:00:00] INFO: win2sac_32: /home/user/bin/win2sac_32.
 
         **Checklist**
 
@@ -762,9 +762,12 @@ def select_stations(self, code, stations=None, minlatitude=None,
             for station in stations_at_server:
                 if station.code != code:
                     continue
-                if point_inside_box(station.latitude, station.longitude,
-                                    latitude=latitude, longitude=longitude,
-                                    minradius=minradius, maxradius=maxradius):
+                if point_inside_box(station.latitude,
+                                    station.longitude,
+                                    minlatitude=minlatitude,
+                                    maxlatitude=maxlatitude,
+                                    minlongitude=minlongitude,
+                                    maxlongitude=maxlongitude):
                     stations_selected.append(station.name)
 
         # select stations in a circular region
@@ -804,7 +807,7 @@ def check_package_release(self):
         """Check whether HinetPy has a new release.
 
         >>> client.check_package_release()
-        [2017-01-01 00:00:00] INFO: You're using the latest release (v0.5.0).
+        [2019-02-19 00:00:00] INFO: You're using the latest release (v0.5.2).
         """
         from HinetPy import __version__, __title__
         from distutils.version import StrictVersion

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2018 Dongdong Tian
+Copyright (c) 2014-2019 Dongdong Tian
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/locale/zh_CN/LC_MESSAGES/api.po b/docs/locale/zh_CN/LC_MESSAGES/api.po
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-07-22 12:20+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.client.po b/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.client.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.header.po b/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.header.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.win32.po b/docs/locale/zh_CN/LC_MESSAGES/api/HinetPy.win32.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/appendix.po b/docs/locale/zh_CN/LC_MESSAGES/appendix.po
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-07-22 12:20+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/appendix/catwin32.po b/docs/locale/zh_CN/LC_MESSAGES/appendix/catwin32.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/appendix/channeltable.po b/docs/locale/zh_CN/LC_MESSAGES/appendix/channeltable.po
@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-07-22 12:20+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/appendix/response.po b/docs/locale/zh_CN/LC_MESSAGES/appendix/response.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:38-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

diff --git a/docs/locale/zh_CN/LC_MESSAGES/appendix/win2sac.po b/docs/locale/zh_CN/LC_MESSAGES/appendix/win2sac.po
@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: HinetPy 0.4.2\n"
+"Project-Id-Version: HinetPy 0.5.2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-21 16:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"