From 6b1a9fe79f8bd0b3fcb257a09271af3180aa207b Mon Sep 17 00:00:00 2001 From: marceloprates Date: Tue, 8 Nov 2022 10:38:23 -0300 Subject: [PATCH] Fixed relative path for presets folder in draw.py --- prettymaps/draw.py | 4 +--- {presets => prettymaps/presets}/barcelona-plotter.json | 0 {presets => prettymaps/presets}/barcelona.json | 0 {presets => prettymaps/presets}/cb-bf-f.json | 0 {presets => prettymaps/presets}/default.json | 0 {presets => prettymaps/presets}/heerhugowaard.json | 0 {presets => prettymaps/presets}/macao.json | 0 {presets => prettymaps/presets}/minimal.json | 0 {presets => prettymaps/presets}/tijuca.json | 0 setup.py | 10 ---------- 10 files changed, 1 insertion(+), 13 deletions(-) rename {presets => prettymaps/presets}/barcelona-plotter.json (100%) rename {presets => prettymaps/presets}/barcelona.json (100%) rename {presets => prettymaps/presets}/cb-bf-f.json (100%) rename {presets => prettymaps/presets}/default.json (100%) rename {presets => prettymaps/presets}/heerhugowaard.json (100%) rename {presets => prettymaps/presets}/macao.json (100%) rename {presets => prettymaps/presets}/minimal.json (100%) rename {presets => prettymaps/presets}/tijuca.json (100%) diff --git a/prettymaps/draw.py b/prettymaps/draw.py index 67f4a6c..2df6be9 100644 --- a/prettymaps/draw.py +++ b/prettymaps/draw.py @@ -16,7 +16,6 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . """ - import re import os import json @@ -41,7 +40,6 @@ from typing import Optional, Union, Tuple, List, Dict, Any, Iterable from shapely.geometry import Point, LineString, MultiLineString, Polygon, MultiPolygon, GeometryCollection, box from shapely.geometry.base import BaseGeometry - #import vsketch @@ -590,7 +588,7 @@ def draw_text( def presets_directory(): - return os.path.join(pathlib.Path(__file__).resolve().parent.parent, 'presets') + return os.path.join(pathlib.Path(__file__).resolve().parent, 'presets') def create_preset( diff --git a/presets/barcelona-plotter.json b/prettymaps/presets/barcelona-plotter.json similarity index 100% rename from presets/barcelona-plotter.json rename to prettymaps/presets/barcelona-plotter.json diff --git a/presets/barcelona.json b/prettymaps/presets/barcelona.json similarity index 100% rename from presets/barcelona.json rename to prettymaps/presets/barcelona.json diff --git a/presets/cb-bf-f.json b/prettymaps/presets/cb-bf-f.json similarity index 100% rename from presets/cb-bf-f.json rename to prettymaps/presets/cb-bf-f.json diff --git a/presets/default.json b/prettymaps/presets/default.json similarity index 100% rename from presets/default.json rename to prettymaps/presets/default.json diff --git a/presets/heerhugowaard.json b/prettymaps/presets/heerhugowaard.json similarity index 100% rename from presets/heerhugowaard.json rename to prettymaps/presets/heerhugowaard.json diff --git a/presets/macao.json b/prettymaps/presets/macao.json similarity index 100% rename from presets/macao.json rename to prettymaps/presets/macao.json diff --git a/presets/minimal.json b/prettymaps/presets/minimal.json similarity index 100% rename from presets/minimal.json rename to prettymaps/presets/minimal.json diff --git a/presets/tijuca.json b/prettymaps/presets/tijuca.json similarity index 100% rename from presets/tijuca.json rename to prettymaps/presets/tijuca.json diff --git a/setup.py b/setup.py index 3a5ea7b..a281ba0 100644 --- a/setup.py +++ b/setup.py @@ -24,14 +24,4 @@ setup( ], package_dir={'prettymaps': '.'}, package_data={'prettymaps': ['presets/*.json']}, - #data_files=[(presets_dir, [ - # 'presets/barcelona-plotter.json', - # 'presets/barcelona.json', - # 'presets/cb-bf-f.json', - # 'presets/default.json', - # 'presets/heerhugowaard.json', - # 'presets/macao.json', - # 'presets/minimal.json', - # 'presets/tijuca.json', - #])], )