2023-08-21 13:44:37 +00:00 · 2023-07-18 19:32:19 +00:00 · 2023-07-18 19:32:19 +00:00 · 2023-07-18 19:32:19 +00:00 · 2023-07-18 19:32:19 +00:00 · 2023-07-18 19:32:19 +00:00
5 changed files with 59 additions and 1101 deletions
--- a/1
+++ b/1
@ -1 +0,0 @@
-Kothic Mapcss parser/processor tailored for Organic Maps use.
--- a/README.md
+++ b/README.md
@ -0,0 +1,9 @@
+Kothic Mapcss parser/processor tailored for Organic Maps use.
+
+Dependencies:
+* Python >= 3.8
+      
+Python dependencies:
+```bash
+pip3 install -r requirements.txt
+```
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1 @@
+protobuf~=4.23.0
--- a/src/drules_struct_pb2.py
+++ b/src/drules_struct_pb2.py
--- a/src/libkomwm.py
+++ b/src/libkomwm.py
@ -2,11 +2,11 @@ from mapcss import MapCSS
 from optparse import OptionParser
 import os
 import csv
-import sys
 import functools
 from multiprocessing import Pool, set_start_method
 from collections import OrderedDict
 import mapcss.webcolors
+from drules_struct_pb2 import *

 whatever_to_hex = mapcss.webcolors.webcolors.whatever_to_hex
 whatever_to_cairo = mapcss.webcolors.webcolors.whatever_to_cairo
@ -14,17 +14,6 @@ whatever_to_cairo = mapcss.webcolors.webcolors.whatever_to_cairo
 PROFILE = False
 MULTIPROCESSING = True

-# If path to the protobuf EGG is specified then apply it before import drules_struct_pb2
-PROTOBUF_EGG_PATH = os.environ.get("PROTOBUF_EGG_PATH")
-if PROTOBUF_EGG_PATH:
-    # another version of protobuf may be installed, override it
-    for i in range(len(sys.path)):
-        if -1 != sys.path[i].find("protobuf-"):
-            sys.path[i] = PROTOBUF_EGG_PATH
-    sys.path.append(PROTOBUF_EGG_PATH)
-
-from drules_struct_pb2 import *
-
 WIDTH_SCALE = 1.0

 # z-index values defined in mapcss files are first
				`@ -1 +0,0 @@`
				`Kothic Mapcss parser/processor tailored for Organic Maps use.`
				`@ -0,0 +1 @@`
pastk commented 2023-07-18 19:33:33 +00:00 Review Copy link `protobuf~=4.23.0` We're going to have at least minor updates, right? ```suggestion protobuf~=4.23.0 ``` We're going to have at least minor updates, right? pastk commented 2023-07-18 19:33:33 +00:00 Review Copy link `protobuf~=4.23.0` We're going to have at least minor updates, right? ```suggestion protobuf~=4.23.0 ``` We're going to have at least minor updates, right?
				`protobuf~=4.23.0`
pastk commented 2023-07-18 19:33:33 +00:00 Review Copy link `protobuf~=4.23.0` We're going to have at least minor updates, right? ```suggestion protobuf~=4.23.0 ``` We're going to have at least minor updates, right?