]> mj.ucw.cz Git - leo.git/log
leo.git
8 years agoLabelling: Bugfixes in get_closure labelling
Karolina Buresova [Sun, 26 Jul 2015 00:17:28 +0000 (02:17 +0200)]
Labelling: Bugfixes in get_closure

Ooops

8 years agoLabelling: Weights in rankings are configurable
Karryanna [Thu, 23 Jul 2015 15:50:50 +0000 (17:50 +0200)]
Labelling: Weights in rankings are configurable

8 years agoLabelling: Support for better bitmaps granularity
Karryanna [Fri, 3 Jul 2015 14:56:33 +0000 (16:56 +0200)]
Labelling: Support for better bitmaps granularity

Hasn't been extensively tested yet

8 years agoSymbolizers may visually compare two symbols
Karryanna [Wed, 1 Jul 2015 16:16:02 +0000 (18:16 +0200)]
Symbolizers may visually compare two symbols

8 years agoSymbolizers may return copy of symbol
Karryanna [Wed, 1 Jul 2015 16:07:02 +0000 (18:07 +0200)]
Symbolizers may return copy of symbol

8 years agoLabelling: Rotation computation improved and commented on
Karryanna [Wed, 1 Jul 2015 10:05:24 +0000 (12:05 +0200)]
Labelling: Rotation computation improved and commented on

8 years agoLabelling: Warning and FIXME in cut_edge
Karryanna [Wed, 1 Jul 2015 09:36:28 +0000 (11:36 +0200)]
Labelling: Warning and FIXME in cut_edge

8 years agoLabelling: (Mostly) structs documentation and cleanup
Karryanna [Wed, 1 Jul 2015 09:29:33 +0000 (11:29 +0200)]
Labelling: (Mostly) structs documentation and cleanup

8 years agoLabelling: Breaking labeller into more source files
Karryanna [Tue, 30 Jun 2015 17:19:44 +0000 (19:19 +0200)]
Labelling: Breaking labeller into more source files

8 years agoLabelling: Degree/radian conversions have functions
Karryanna [Tue, 30 Jun 2015 14:27:04 +0000 (16:27 +0200)]
Labelling: Degree/radian conversions have functions

8 years agoLabeller: add_line renamed, add_linelabel/add_arealabel merged
Karryanna [Tue, 30 Jun 2015 13:19:57 +0000 (15:19 +0200)]
Labeller: add_line renamed, add_linelabel/add_arealabel merged

labeller_add_line renamed to labeller_notify_line + it no loger
plans the line

labeller_add_linelabel and labeller_add_arealabel are now both
called as labeller_add_label

8 years agoLabelling: Evolution parameters can be set in config file
Karryanna [Tue, 30 Jun 2015 13:03:25 +0000 (15:03 +0200)]
Labelling: Evolution parameters can be set in config file

8 years agoLabeller: DEBUG macro for one-line debug prints
Karryanna [Mon, 29 Jun 2015 17:05:03 +0000 (19:05 +0200)]
Labeller: DEBUG macro for one-line debug prints

8 years agoLabeller: Cleanup: There's more to clean
Karryanna [Mon, 29 Jun 2015 16:39:19 +0000 (18:39 +0200)]
Labeller: Cleanup: There's more to clean

8 years agoLabelling: Changes in overlap counting to decrease complexity
Karryanna [Mon, 29 Jun 2015 16:33:59 +0000 (18:33 +0200)]
Labelling: Changes in overlap counting to decrease complexity

Repeated initialization of planned array made the computation
quadratic in fact. The array is now initialized only ones.

8 years agoLabeller: Use hypot for eucleidian distance consistently
Karryanna [Mon, 29 Jun 2015 15:41:20 +0000 (17:41 +0200)]
Labeller: Use hypot for eucleidian distance consistently

8 years ago[Labelling] Coding style fixes and cleanups in other modules
Karryanna [Mon, 29 Jun 2015 15:36:37 +0000 (17:36 +0200)]
[Labelling] Coding style fixes and cleanups in other modules

8 years agoLabeller: Better format strings in printfs
Karryanna [Mon, 29 Jun 2015 15:10:23 +0000 (17:10 +0200)]
Labeller: Better format strings in printfs

8 years agoLabeller: use xmalloc instead of malloc
Karryanna [Mon, 29 Jun 2015 15:00:29 +0000 (17:00 +0200)]
Labeller: use xmalloc instead of malloc

8 years agoLabeller: Redundant num_longlines removed
Karryanna [Mon, 29 Jun 2015 14:58:12 +0000 (16:58 +0200)]
Labeller: Redundant num_longlines removed

8 years agoLabeller: Unnecessary returns removed
Karryanna [Mon, 29 Jun 2015 14:55:45 +0000 (16:55 +0200)]
Labeller: Unnecessary returns removed

8 years agoLabelling: Segments: A bunch of improvements
Karryanna [Wed, 10 Jun 2015 12:09:26 +0000 (14:09 +0200)]
Labelling: Segments: A bunch of improvements

• Missing prototypes for create/delete map links
• Removed debug print (committed accidentaly)
• Hiding/unhiding segment labels after crossover
• Better way to choose variant for segment labels
• Distance penalty for segment labels
• Hopefully more reasonable placement init for segments

8 years agoLabelling: Support for rotated labels
Karryanna [Wed, 10 Jun 2015 09:23:06 +0000 (11:23 +0200)]
Labelling: Support for rotated labels

This forced some changes in segment initialization which are not nice
and might deserve some rethinking in the future.

8 years agoLabelling: Better dump of bitmaps
Karryanna [Wed, 10 Jun 2015 09:04:06 +0000 (11:04 +0200)]
Labelling: Better dump of bitmaps

... now it really supports non-rectangular bitmaps O:)

8 years agoLabelling: Small fixes in rand*
Karryanna [Tue, 9 Jun 2015 12:17:53 +0000 (14:17 +0200)]
Labelling: Small fixes in rand*

8 years agoLabelling: Scrap of penalties for not placing a label
Karryanna [Tue, 9 Jun 2015 12:17:06 +0000 (14:17 +0200)]
Labelling: Scrap of penalties for not placing a label

8 years agoLabelling: Placing out of paper is counted as overlap
Karryanna [Tue, 9 Jun 2015 12:16:13 +0000 (14:16 +0200)]
Labelling: Placing out of paper is counted as overlap

8 years agoLabelling: Option to complete population by elitism
Karryanna [Tue, 9 Jun 2015 11:07:31 +0000 (13:07 +0200)]
Labelling: Option to complete population by elitism

Mostly a hot-fix to situation when rounding causes the sum of individuals
created by specific methods not to fit the desired population size

8 years agoLabelling: Some randint call fixes
Karryanna [Tue, 9 Jun 2015 11:06:09 +0000 (13:06 +0200)]
Labelling: Some randint call fixes

randint(min, max) returns random number in range <min, max)

8 years agoLabelling: Fix of memleaks et al, mostly by redesign
Karryanna [Tue, 9 Jun 2015 11:03:44 +0000 (13:03 +0200)]
Labelling: Fix of memleaks et al, mostly by redesign

Map placement links redesigned, individual manipulation redesigned

8 years agoLabelling: Ooops, forgotten header file
Karryanna [Wed, 13 May 2015 23:25:00 +0000 (01:25 +0200)]
Labelling: Ooops, forgotten header file

8 years agoLabelling: Generally making code nicer :)
Karryanna [Wed, 13 May 2015 23:23:26 +0000 (01:23 +0200)]
Labelling: Generally making code nicer :)

Cleanup, reorganization, small fixes, parameters changes, ...

8 years agoLabelling: Getting rid of GCC warnings
Karryanna [Wed, 13 May 2015 21:59:45 +0000 (23:59 +0200)]
Labelling: Getting rid of GCC warnings

8 years agoLabelling: Ranking now considers also distances
Karryanna [Wed, 13 May 2015 21:55:39 +0000 (23:55 +0200)]
Labelling: Ranking now considers also distances

8 years agoLabelling: Introducing new enum for verbosity
Karryanna [Wed, 13 May 2015 21:54:57 +0000 (23:54 +0200)]
Labelling: Introducing new enum for verbosity

8 years agoLabelling: Map parts generation doesn't round coordinates up
Karryanna [Wed, 13 May 2015 21:52:27 +0000 (23:52 +0200)]
Labelling: Map parts generation doesn't round coordinates up

8 years agoLabelling: Breeding
Karryanna [Wed, 13 May 2015 21:51:39 +0000 (23:51 +0200)]
Labelling: Breeding

8 years agoLabelling: Variants may have offset
Karryanna [Wed, 13 May 2015 21:48:22 +0000 (23:48 +0200)]
Labelling: Variants may have offset

8 years agoLabelling: Let's use generic make_bitmap everywhere
Karryanna [Wed, 13 May 2015 21:47:41 +0000 (23:47 +0200)]
Labelling: Let's use generic make_bitmap everywhere

8 years agoLabelling: Movement tuning
Karryanna [Wed, 13 May 2015 21:47:10 +0000 (23:47 +0200)]
Labelling: Movement tuning

8 years agoLabelling: Placements have indices
Karryanna [Wed, 13 May 2015 21:46:25 +0000 (23:46 +0200)]
Labelling: Placements have indices

8 years agoLabelling: Penalties dump takes population as argument
Karryanna [Wed, 13 May 2015 21:45:10 +0000 (23:45 +0200)]
Labelling: Penalties dump takes population as argument

8 years agoLabelling: Using slope for segments
Karryanna [Wed, 13 May 2015 17:05:43 +0000 (19:05 +0200)]
Labelling: Using slope for segments

8 years agoLabelling: Let's evolve!
Karryanna [Wed, 13 May 2015 17:04:48 +0000 (19:04 +0200)]
Labelling: Let's evolve!

8 years agoLabelling: Fixes in map parts generation
Karryanna [Wed, 13 May 2015 16:58:24 +0000 (18:58 +0200)]
Labelling: Fixes in map parts generation

8 years agoLabelling: Some fixes concerning variants initialization
Karryanna [Wed, 13 May 2015 16:56:13 +0000 (18:56 +0200)]
Labelling: Some fixes concerning variants initialization

8 years agoLabelling: Changes in symbols movement
Karryanna [Wed, 13 May 2015 16:55:07 +0000 (18:55 +0200)]
Labelling: Changes in symbols movement

8 years agoLabelling: Overlaps outside of map are not considered
Karryanna [Wed, 13 May 2015 16:52:00 +0000 (18:52 +0200)]
Labelling: Overlaps outside of map are not considered

8 years agoLabelling: make_population and copy_individual fixes
Karryanna [Wed, 13 May 2015 16:51:25 +0000 (18:51 +0200)]
Labelling: make_population and copy_individual fixes

8 years agoLabelling: randdouble implementation
Karryanna [Wed, 13 May 2015 16:49:13 +0000 (18:49 +0200)]
Labelling: randdouble implementation

8 years agoLabelling: Comparison of individuals
Karryanna [Wed, 13 May 2015 09:46:40 +0000 (11:46 +0200)]
Labelling: Comparison of individuals

8 years agoLabelling: Basic ranking
Karryanna [Wed, 13 May 2015 09:46:09 +0000 (11:46 +0200)]
Labelling: Basic ranking

8 years agoLabelling: Counting label overlaps
Karryanna [Wed, 13 May 2015 09:45:24 +0000 (11:45 +0200)]
Labelling: Counting label overlaps

8 years agoLabelling: Another cleanup among debug prints
Karryanna [Wed, 13 May 2015 09:43:39 +0000 (11:43 +0200)]
Labelling: Another cleanup among debug prints

8 years agoLabelling: (Hopefully) safer bitmap creation
Karryanna [Wed, 13 May 2015 09:41:41 +0000 (11:41 +0200)]
Labelling: (Hopefully) safer bitmap creation

8 years agoLabelling: FIXME note in segment creation
Karryanna [Wed, 13 May 2015 09:40:49 +0000 (11:40 +0200)]
Labelling: FIXME note in segment creation

8 years agoLabelling: Bitmaps dump ignores unplaced requests
Karryanna [Wed, 13 May 2015 09:40:11 +0000 (11:40 +0200)]
Labelling: Bitmaps dump ignores unplaced requests

8 years agoLabelling: Small fix in generating map parts for placement
Karryanna [Wed, 13 May 2015 09:38:24 +0000 (11:38 +0200)]
Labelling: Small fix in generating map parts for placement

8 years agoLabelling: pointing to variants redesigned
Karryanna [Wed, 13 May 2015 06:05:36 +0000 (08:05 +0200)]
Labelling: pointing to variants redesigned

• Scrapped line variants (they weren't used anyway)
• Variants are pointed by general request
will be unused for some request types but it makes
implementation for the rest much easier

8 years agoLabelling: Cleanup among debug prints
Karryanna [Tue, 12 May 2015 19:03:46 +0000 (21:03 +0200)]
Labelling: Cleanup among debug prints

8 years agoLabelling: Hacks and fixes in segment creation
Karryanna [Tue, 12 May 2015 18:58:09 +0000 (20:58 +0200)]
Labelling: Hacks and fixes in segment creation

8 years agoLabelling: Let's truly support map parts and links to them
Karryanna [Tue, 12 May 2015 18:56:56 +0000 (20:56 +0200)]
Labelling: Let's truly support map parts and links to them

8 years agoLabelling: bitmaps for labels are still somewhat dummy (no rotation)
Karryanna [Tue, 12 May 2015 18:54:20 +0000 (20:54 +0200)]
Labelling: bitmaps for labels are still somewhat dummy (no rotation)

8 years agoLabelling: Placement shall containt pointer to individual
Karryanna [Tue, 12 May 2015 18:52:35 +0000 (20:52 +0200)]
Labelling: Placement shall containt pointer to individual

8 years agoLabelling: Selecting only one segment for each section
Karryanna [Tue, 12 May 2015 13:02:25 +0000 (15:02 +0200)]
Labelling: Selecting only one segment for each section

8 years agoLabelling: Ignoring placements with negative variant chosen
Karryanna [Tue, 12 May 2015 13:02:05 +0000 (15:02 +0200)]
Labelling: Ignoring placements with negative variant chosen

8 years agoLabelling: Small FIXME concerning segment labels
Karryanna [Tue, 12 May 2015 13:01:13 +0000 (15:01 +0200)]
Labelling: Small FIXME concerning segment labels

8 years agoLabelling: Individual is planned to map inside a function
Karryanna [Tue, 12 May 2015 12:44:44 +0000 (14:44 +0200)]
Labelling: Individual is planned to map inside a function

8 years agoMerge branch 'master' into labelling
Karryanna [Tue, 12 May 2015 12:29:25 +0000 (14:29 +0200)]
Merge branch 'master' into labelling

8 years agoLabelling: Deletion of debug prints in sym.c
Karryanna [Tue, 12 May 2015 12:27:12 +0000 (14:27 +0200)]
Labelling: Deletion of debug prints in sym.c

8 years agoLabelling: Cutting long edges into more segments
Karryanna [Tue, 12 May 2015 12:25:12 +0000 (14:25 +0200)]
Labelling: Cutting long edges into more segments

8 years agoLabelling: Another bunch of changes
Karryanna [Sat, 9 May 2015 17:09:46 +0000 (19:09 +0200)]
Labelling: Another bunch of changes

8 years agoLabeller: Backup before bisect
Karryanna [Sat, 9 May 2015 10:20:29 +0000 (12:20 +0200)]
Labeller: Backup before bisect

8 years agoLabelling: Mostly backup of current state
Karryanna [Thu, 7 May 2015 14:21:03 +0000 (16:21 +0200)]
Labelling: Mostly backup of current state

9 years agoLabelling: Kind of backup before clean-up :D
Karryanna [Thu, 16 Apr 2015 15:36:04 +0000 (17:36 +0200)]
Labelling: Kind of backup before clean-up :D

9 years agoLow-level parts of text rotation
Martin Mares [Thu, 16 Apr 2015 14:38:12 +0000 (16:38 +0200)]
Low-level parts of text rotation

There are currently no style properties to control that,
but it will be used in Karry's labelling branch.

Also made formatting of SVG dimensions slightly more systematic.

9 years agoLabelling: Clean-up and a lot of new mess
Karryanna [Mon, 13 Apr 2015 19:24:13 +0000 (21:24 +0200)]
Labelling: Clean-up and a lot of new mess

9 years agoLabelling: Another bunch of edits
Karryanna [Mon, 13 Apr 2015 09:08:41 +0000 (11:08 +0200)]
Labelling: Another bunch of edits

9 years agoMix of changes O:)
Karryanna [Thu, 9 Apr 2015 19:25:53 +0000 (21:25 +0200)]
Mix of changes O:)

9 years agoLabelling: A bunch of bug-fixes and debug prints
Karryanna [Wed, 8 Apr 2015 08:04:39 +0000 (10:04 +0200)]
Labelling: A bunch of bug-fixes and debug prints

… still seg-faulting, though

9 years agoLabelling: A bit of work done
Karryanna [Tue, 7 Apr 2015 13:32:50 +0000 (15:32 +0200)]
Labelling: A bit of work done

while much more remains…

9 years agoDo not crash on broken multipolygons
Martin Mares [Wed, 1 Apr 2015 14:11:51 +0000 (16:11 +0200)]
Do not crash on broken multipolygons

9 years agoMore ucw-xml includes fixed
Martin Mares [Thu, 12 Feb 2015 23:24:00 +0000 (00:24 +0100)]
More ucw-xml includes fixed

9 years agoMore clean OSM XML parsing
Martin Mares [Thu, 12 Feb 2015 19:04:55 +0000 (20:04 +0100)]
More clean OSM XML parsing

9 years agoLog statistics when a data source is loaded
Martin Mares [Thu, 12 Feb 2015 19:04:31 +0000 (20:04 +0100)]
Log statistics when a data source is loaded

9 years agoAdapted to changes in development version of libucw-xml
Martin Mares [Thu, 12 Feb 2015 18:46:06 +0000 (19:46 +0100)]
Adapted to changes in development version of libucw-xml

9 years agoSimplified XML processing
Martin Mares [Thu, 12 Feb 2015 17:52:18 +0000 (18:52 +0100)]
Simplified XML processing

9 years agoMakefile: We need to link with libm
Martin Mares [Sun, 2 Nov 2014 16:32:33 +0000 (17:32 +0100)]
Makefile: We need to link with libm

9 years agoSupport for reading of shape files (partial)
Martin Mares [Tue, 7 Oct 2014 12:56:43 +0000 (14:56 +0200)]
Support for reading of shape files (partial)

9 years agoSupport for fixed objects
Martin Mares [Mon, 16 Jun 2014 09:40:35 +0000 (11:40 +0200)]
Support for fixed objects

9 years agoIntroduced multiple data sources
Martin Mares [Sun, 15 Jun 2014 21:30:47 +0000 (23:30 +0200)]
Introduced multiple data sources

9 years agoDisable logo drawing hacks
Martin Mares [Sun, 15 Jun 2014 20:35:27 +0000 (22:35 +0200)]
Disable logo drawing hacks

9 years agoRotation controlled by a config option
Martin Mares [Sun, 15 Jun 2014 20:01:57 +0000 (22:01 +0200)]
Rotation controlled by a config option

9 years agoAdded .gitignore
Martin Mares [Sun, 15 Jun 2014 19:56:13 +0000 (21:56 +0200)]
Added .gitignore

9 years agoLet leo.h include autoconf.h
Martin Mares [Sun, 15 Jun 2014 19:55:41 +0000 (21:55 +0200)]
Let leo.h include autoconf.h

9 years agoMoved auxiliary tools to their own directory
Martin Mares [Sun, 15 Jun 2014 19:44:50 +0000 (21:44 +0200)]
Moved auxiliary tools to their own directory

9 years agoSwitched to UCW configure and build system
Martin Mares [Sun, 15 Jun 2014 19:44:16 +0000 (21:44 +0200)]
Switched to UCW configure and build system

9 years agoClean up inclusion guards
Martin Mares [Sun, 15 Jun 2014 19:02:20 +0000 (21:02 +0200)]
Clean up inclusion guards

9 years agoImported experimental version from poskole2014.git
Martin Mares [Sun, 15 Jun 2014 18:34:29 +0000 (20:34 +0200)]
Imported experimental version from poskole2014.git