ameshアップデート2022/05 #997

m77so · 2022-05-07T04:48:58Z

ameshの改良( #640 )

マップ描画部分を書き直して切り出し
- 指定した緯度・経度の場所にマーカーや線を描画しやすく
- マップの上に追加の地図タイルを描画しやすく
指定した地点が地図の中心ではなかったのを中心にするように修正
指定した地点の場所がわかりやすいように、10km, 20km, 30km, 50km, 100kmの同心円を描画
雨雲レーダーの更新時刻がわかるように、画像内にタイムスタンプを記述

雷レーダーの追加( closes: #983 )

雷レーダーの表示

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

massongit · 2022-05-07T04:56:08Z

ipag.ttf をgitの管理下に置く代わりにDockerfile内でダウンロード・配置すると、バージョンが明記されて良い説？

massongit · 2022-05-07T04:58:38Z

いや、それするとテストうまくいかない説あるか。

pr-formatでPipfile.lockの差分のPRが出るようにする

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

library/hatomap.py

library/jma_amesh.py

library/hatomap.py

Co-authored-by: Goryudyuma(Kei.Matsumoto) <6211370+Goryudyuma@users.noreply.github.com>

library/hatomap.py

massongit · 2022-05-07T07:13:08Z

library/jma_amesh.py

+            data = [TimeJsonElement(**i) for i in json.loads(response.text)]
+            timejson += data
+
+    elements = list(set([e for i in timejson for e in i.elements]))


Suggested change

elements = list(set([e for i in timejson for e in i.elements]))

elements = list(set(e for i in timejson for e in i.elements))

こんな感じでもできるはず。

…amesh-new-engine .pre-commit-config.yamlを直してあげたよ！PRをマージしてね！ #997

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

formatが間違ってたので直してあげたよ！ #997

library/hatomap.py

formatが間違ってたので直してあげたよ！ #997

massongit · 2022-09-24T05:57:31Z

library/hatomap.py

+            self.mapbox.height = height - offset_top
+        if width is not None:
+            self.mapbox.width = width
+        body_img = None


Suggested change

body_img = None

body_img: Optional[np.ndarray] = None

https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:462:27: E1136: Value 'body_img' is unsubscriptable (unsubscriptable-object)

は上記のようにすると良さそう？

massongit · 2022-09-24T06:01:41Z

library/hatomap.py

+            .T
+        )
+
+    def geocoords2pixel(


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:145: error: Argument 1 to "_ndarray_geocoords2pixel" of "WebMercatorPixelBBox" has incompatible type "Union[ndarray[Any, Any], GeoCoord, List[GeoCoord]]"; expected "ndarray[Any, Any]" library/hatomap.py:148: error: Argument 1 to "geocoord2pixel" of "WebMercatorPixelBBox" has incompatible type "Union[ndarray[Any, Any], GeoCoord, List[GeoCoord]]"; expected "GeoCoord" library/hatomap.py:150: error: Item "GeoCoord" of "Union[ndarray[Any, Any], GeoCoord, List[GeoCoord]]" has no attribute "__iter__" (not iterable)

geocoords の型ごとにメソッドを分けた方が良い説。

massongit · 2022-09-24T06:02:44Z

library/hatomap.py

+            np.asarray(bytearray(requests.get(url).content), dtype=np.uint8), -1
+        )
+
+    def request(self, bbox: WebMercatorPixelBBox = None) -> np.ndarray:


Suggested change

def request(self, bbox: WebMercatorPixelBBox = None) -> np.ndarray:

def request(self, bbox: WebMercatorPixelBBox = None) -> Optional[np.ndarray]:

https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:185: error: Incompatible return value type (got "None", expected "ndarray[Any, Any]")

上記が正しそう。

massongit · 2022-09-24T06:04:14Z

library/hatomap.py

+    color: Tuple[int, int, int, int] = (255, 0, 255, 255)
+
+    def get_image(self, bbox: WebMercatorPixelBBox = None) -> np.ndarray:
+        img = np.zeros((bbox.height, bbox.width, 4), np.uint8)


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:225: error: Item "None" of "Optional[WebMercatorPixelBBox]" has no attribute "height" library/hatomap.py:225: error: Item "None" of "Optional[WebMercatorPixelBBox]" has no attribute "width"

library/hatomap.py:235: error: Item "None" of "Optional[WebMercatorPixelBBox]" has no attribute "geocoords2pixel"

ここの前に bbox が None かどうかのチェックを入れる必要がありそう。

massongit · 2022-09-24T06:06:55Z

library/hatomap.py

+
+@dataclass
+class LineTrace:
+    coords: Union[List["np.ndarray"], List[List[GeoCoord]]]


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:230: error: Value of type "Union[Any, GeoCoord]" is not indexable

library/hatomap.py:263: error: Value of type "Union[Any, GeoCoord]" is not indexable

coords をそれぞれの型ごとに設けると良さそう？

massongit · 2022-09-24T06:13:38Z

library/hatomap.py

+
+@dataclass
+class RasterLayer:
+    url: Union[List[str], str]


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:354: error: Incompatible types in assignment (expression has type "Union[List[str], str]", variable has type "str")

url をそれぞれの型ごとに設けると良さそう？

massongit · 2022-09-24T06:14:16Z

library/hatomap.py

+
+    mapbox: MapBox = MapBox()
+    basemap: str = "open-street-map"
+    extra_basemap_server: str = None


Suggested change

extra_basemap_server: str = None

extra_basemap_server: Optional[str] = None

https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:395: error: Incompatible types in assignment (expression has type "None", variable has type "str")

massongit · 2022-09-24T06:14:48Z

library/hatomap.py

+    mapbox: MapBox = MapBox()
+    basemap: str = "open-street-map"
+    extra_basemap_server: str = None
+    layers: List[Union[RasterLayer, LineTrace]] = None


Suggested change

layers: List[Union[RasterLayer, LineTrace]] = None

layers: Optional[List[Union[RasterLayer, LineTrace]]] = None

https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:396: error: Incompatible types in assignment (expression has type "None", variable has type "List[Union[RasterLayer, LineTrace]]")

massongit · 2022-09-24T06:15:20Z

library/hatomap.py

+    basemap: str = "open-street-map"
+    extra_basemap_server: str = None
+    layers: List[Union[RasterLayer, LineTrace]] = None
+    title: str = None


Suggested change

title: str = None

title: Optional[str] = None

https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:397: error: Incompatible types in assignment (expression has type "None", variable has type "str")

massongit · 2022-09-24T06:18:34Z

library/hatomap.py

+                    1 - layer_img[..., 3:] / 255
+                ) + layer_img[..., :3] * (layer_img[..., 3:] / 255)
+
+        img = np.zeros((height, width, 3), np.uint8)


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/hatomap.py:466: error: Argument 1 to "zeros" has incompatible type "Tuple[Optional[int], Optional[int], int]"; expected "Union[SupportsIndex, Sequence[SupportsIndex]]"

ここより前に height や width が None だった時の処理を入れると良さそう。

massongit · 2022-09-24T06:25:01Z

library/jma_amesh.py

+        layers=[
+            RasterLayer(
+                url=get_jma_image_server(jma_timestamp["hrpns_nd"]), opacity=128 / 256
+            )
+        ]
+        + [
+            LineTrace(
+                coords=[get_circle(lat, lng, d * 1000)], color=(100, 100, 100, 255)
+            )
+            for d in range(10, 60, 10)
+        ]
+        + [
+            MarkerTrace(
+                [GeoCoord(e[0], e[1]) for e in get_liden(jma_timestamp["liden"])],
+                size=14,
+                symbol="thunder",
+                fill_color=(0, 255, 255, 255),
+                border_color=(0, 64, 64, 255),
+            )
+        ],


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/jma_amesh.py:126: error: Argument "layers" to "HatoMap" has incompatible type "List[RasterLayer]"; expected "List[Union[RasterLayer, LineTrace]]" library/jma_amesh.py:126: note: "List" is invariant -- see https://mypy.readthedocs.io/en/stable/common_issues.html#variance library/jma_amesh.py:126: note: Consider using "Sequence" instead, which is covariant library/jma_amesh.py:132: error: List comprehension has incompatible type List[LineTrace]; expected List[RasterLayer] library/jma_amesh.py:138: error: List item 0 has incompatible type "MarkerTrace"; expected "RasterLayer"

RasterLayer, LineTrace, LineTrace の各配列を List[Union[RasterLayer, LineTrace]] として変数定義して結合させれば良さそう？

massongit · 2022-09-24T06:29:34Z

library/jma_amesh.py

+        ]
+        + [
+            MarkerTrace(
+                [GeoCoord(e[0], e[1]) for e in get_liden(jma_timestamp["liden"])],


https://github.com/dev-hato/hato-bot/actions/runs/2783525807/jobs/4380588635

library/jma_amesh.py:139: error: Item "None" of "Optional[List[Tuple[float, float, int]]]" has no attribute "__iter__" (not iterable)

ここより前で get_liden(jma_timestamp["liden"]) が None かのチェックを入れると良さそう。

massongit · 2022-09-24T06:35:10Z

black や isort の指摘事項についてはコンフリクトを解消すればformat修正のPRとして出されるはず: #1504

m77so and others added 2 commits May 7, 2022 13:47

新しいマップエンジンにする

0bd1cc7

鳩は唐揚げ！(自動で直してあげたよ！)

12217bf

github-actions bot mentioned this pull request May 7, 2022

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997 #998

Merged

m77so added 2 commits May 7, 2022 13:51

Merge pull request #998 from dev-hato/fix-format-amesh-new-engine

85b5ed0

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

fix module path

5b1536c

m77so and others added 2 commits May 7, 2022 13:59

add opencv, update pillow

3a392f5

pr-formatでPipfile.lockの差分のPRが出るようにする

4cb976d

massongit mentioned this pull request May 7, 2022

pr-formatでPipfile.lockの差分のPRが出るようにする #999

Merged

massongit and others added 3 commits May 7, 2022 14:27

条件修正

a3babc1

Merge pull request #999 from dev-hato/fix_format_ci

72f69e6

pr-formatでPipfile.lockの差分のPRが出るようにする

鳩は唐揚げ！(自動で直してあげたよ！)

db9371f

github-actions bot mentioned this pull request May 7, 2022

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997 #1002

Merged

Merge pull request #1002 from dev-hato/fix-format-amesh-new-engine

5091bc8

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

github-actions bot mentioned this pull request May 7, 2022

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997 #1003

Closed

m77so added 4 commits May 7, 2022 15:04

add opencv lib

114893c

fix

8039b96

fix library path

452bc1f

fix timestamp

6b69c3d

m77so changed the title ~~新しいマップエンジンにする~~ ameshアップデート2022 May 7, 2022

m77so changed the title ~~ameshアップデート2022~~ ameshアップデート2022/05 May 7, 2022

massongit reviewed May 7, 2022

View reviewed changes

library/hatomap.py Outdated Show resolved Hide resolved

library/hatomap.py Outdated Show resolved Hide resolved

library/jma_amesh.py Outdated Show resolved Hide resolved

fix for test

a9bc17e

Goryudyuma reviewed May 7, 2022

View reviewed changes

library/hatomap.py Outdated Show resolved Hide resolved

library/hatomap.py Outdated Show resolved Hide resolved

Update library/hatomap.py

8624746

Co-authored-by: Goryudyuma(Kei.Matsumoto) <6211370+Goryudyuma@users.noreply.github.com>

github-actions bot mentioned this pull request May 7, 2022

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997 #1005

Merged

Goryudyuma reviewed May 7, 2022

View reviewed changes

library/hatomap.py Outdated Show resolved Hide resolved

library/hatomap.py Outdated Show resolved Hide resolved

library/hatomap.py Outdated Show resolved Hide resolved

library/hatomap.py Outdated Show resolved Hide resolved

fix inttelij linter

5fec142

massongit reviewed May 7, 2022

View reviewed changes

m77so and others added 2 commits June 4, 2022 10:52

Merge branch 'develop' into amesh-new-engine

1111974

鳩は唐揚げ！(自動で直してあげたよ！)

a7e56d9

github-actions bot mentioned this pull request Jun 4, 2022

.pre-commit-config.yamlを直してあげたよ！PRをマージしてね！ #997 #1048

Merged

m77so and others added 2 commits June 4, 2022 17:04

Merge pull request #1048 from dev-hato/fix-version-pre-commit-config-…

5c5ce0f

…amesh-new-engine .pre-commit-config.yamlを直してあげたよ！PRをマージしてね！ #997

鳩は唐揚げ！(自動で直してあげたよ！)

7229fa2

massongit mentioned this pull request Jun 15, 2022

pr-formatでPipfile.lockの差分のPRが出るようにする #1073

Merged

nakkaa and others added 4 commits July 15, 2022 22:47

Merge pull request #1008 from dev-hato/fix-format-amesh-new-engine

a1a0bf7

formatが間違ってたので直してあげたよ！PRをマージしてね！ #997

merge commit

c8f61eb

Merge branch 'develop' into amesh-new-engine

b46caf4

formatが間違ってたので直してあげたよ！

6ca6206

github-actions bot mentioned this pull request Jul 29, 2022

formatが間違ってたので直してあげたよ！ #997 #1299

Merged

m77so and others added 3 commits August 3, 2022 00:01

Merge pull request #1299 from dev-hato/fix-format-amesh-new-engine

775e68f

formatが間違ってたので直してあげたよ！ #997

fix git

c271f30

formatが間違ってたので直してあげたよ！

83e343a

github-actions bot mentioned this pull request Aug 2, 2022

formatが間違ってたので直してあげたよ！ #997 #1309

Merged

massongit reviewed Aug 2, 2022

View reviewed changes

library/hatomap.py Outdated Show resolved Hide resolved

m77so and others added 4 commits August 3, 2022 00:22

Merge pull request #1309 from dev-hato/fix-format-amesh-new-engine

2e42d45

formatが間違ってたので直してあげたよ！ #997

add ipa font license files

3e66b2e

fix super linter format

8dec1c4

formatが間違ってたので直してあげたよ！

4ebd592

github-actions bot mentioned this pull request Aug 2, 2022

formatが間違ってたので直してあげたよ！ #997 #1310

Merged

Merge pull request #1310 from dev-hato/fix-format-amesh-new-engine

4c23a4a

formatが間違ってたので直してあげたよ！ #997

massongit reviewed Sep 24, 2022

View reviewed changes

This was referenced Oct 16, 2022

フォーマッターをかける対象としてgeojson追加 dev-hato/actions-format-json-yml#218

Merged

ameshアップデート2022/05 (マージできる状態にした) #1698

Closed

massongit mentioned this pull request Nov 5, 2022

ameshアップデート2022/05 (マージできる状態にした) #1838

Merged

massongit merged commit 549f36d into develop Nov 5, 2022

massongit deleted the amesh-new-engine branch November 5, 2022 03:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ameshアップデート2022/05 #997

ameshアップデート2022/05 #997

m77so commented May 7, 2022 •

edited

Loading

massongit commented May 7, 2022

massongit commented May 7, 2022

massongit May 7, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit Sep 24, 2022

massongit commented Sep 24, 2022 •

edited

Loading

	elements = list(set([e for i in timejson for e in i.elements]))
	elements = list(set(e for i in timejson for e in i.elements))

	def request(self, bbox: WebMercatorPixelBBox = None) -> np.ndarray:
	def request(self, bbox: WebMercatorPixelBBox = None) -> Optional[np.ndarray]:

	extra_basemap_server: str = None
	extra_basemap_server: Optional[str] = None

	layers: List[Union[RasterLayer, LineTrace]] = None
	layers: Optional[List[Union[RasterLayer, LineTrace]]] = None

ameshアップデート2022/05 #997

ameshアップデート2022/05 #997

Conversation

m77so commented May 7, 2022 • edited Loading

massongit commented May 7, 2022

massongit commented May 7, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

massongit commented Sep 24, 2022 • edited Loading

m77so commented May 7, 2022 •

edited

Loading

massongit commented Sep 24, 2022 •

edited

Loading